diff --git a/lang/core/datetime/format_func.go b/lang/core/datetime/format.go
similarity index 100%
rename from lang/core/datetime/format_func.go
rename to lang/core/datetime/format.go
diff --git a/lang/core/datetime/format_func_test.go b/lang/core/datetime/format_test.go
similarity index 100%
rename from lang/core/datetime/format_func_test.go
rename to lang/core/datetime/format_test.go
diff --git a/lang/core/datetime/hour_func.go b/lang/core/datetime/hour.go
similarity index 100%
rename from lang/core/datetime/hour_func.go
rename to lang/core/datetime/hour.go
diff --git a/lang/core/datetime/print_func.go b/lang/core/datetime/print.go
similarity index 100%
rename from lang/core/datetime/print_func.go
rename to lang/core/datetime/print.go
diff --git a/lang/core/datetime/weekday_func.go b/lang/core/datetime/weekday.go
similarity index 100%
rename from lang/core/datetime/weekday_func.go
rename to lang/core/datetime/weekday.go
diff --git a/lang/core/deploy/abspath_func.go b/lang/core/deploy/abspath.go
similarity index 100%
rename from lang/core/deploy/abspath_func.go
rename to lang/core/deploy/abspath.go
diff --git a/lang/core/deploy/binary_func.go b/lang/core/deploy/binary.go
similarity index 100%
rename from lang/core/deploy/binary_func.go
rename to lang/core/deploy/binary.go
diff --git a/lang/core/deploy/bootstrap_packages_func.go b/lang/core/deploy/bootstrap_packages.go
similarity index 100%
rename from lang/core/deploy/bootstrap_packages_func.go
rename to lang/core/deploy/bootstrap_packages.go
diff --git a/lang/core/deploy/readfile_func.go b/lang/core/deploy/readfile.go
similarity index 100%
rename from lang/core/deploy/readfile_func.go
rename to lang/core/deploy/readfile.go
diff --git a/lang/core/deploy/readfileabs_func.go b/lang/core/deploy/readfileabs.go
similarity index 100%
rename from lang/core/deploy/readfileabs_func.go
rename to lang/core/deploy/readfileabs.go
diff --git a/lang/core/example/answer_func.go b/lang/core/example/answer.go
similarity index 100%
rename from lang/core/example/answer_func.go
rename to lang/core/example/answer.go
diff --git a/lang/core/example/errorbool_func.go b/lang/core/example/errorbool.go
similarity index 100%
rename from lang/core/example/errorbool_func.go
rename to lang/core/example/errorbool.go
diff --git a/lang/core/example/int2str_func.go b/lang/core/example/int2str.go
similarity index 100%
rename from lang/core/example/int2str_func.go
rename to lang/core/example/int2str.go
diff --git a/lang/core/example/plus_func.go b/lang/core/example/plus.go
similarity index 100%
rename from lang/core/example/plus_func.go
rename to lang/core/example/plus.go
diff --git a/lang/core/example/str2int_func.go b/lang/core/example/str2int.go
similarity index 100%
rename from lang/core/example/str2int_func.go
rename to lang/core/example/str2int.go
diff --git a/lang/core/example/vumeter_func.go b/lang/core/example/vumeter.go
similarity index 100%
rename from lang/core/example/vumeter_func.go
rename to lang/core/example/vumeter.go
diff --git a/lang/core/fmt/printf_func.go b/lang/core/fmt/printf.go
similarity index 100%
rename from lang/core/fmt/printf_func.go
rename to lang/core/fmt/printf.go
diff --git a/lang/core/golang/template_func.go b/lang/core/golang/template.go
similarity index 100%
rename from lang/core/golang/template_func.go
rename to lang/core/golang/template.go
diff --git a/lang/core/iter/filter_func.go b/lang/core/iter/filter.go
similarity index 100%
rename from lang/core/iter/filter_func.go
rename to lang/core/iter/filter.go
diff --git a/lang/core/iter/map_func.go b/lang/core/iter/map.go
similarity index 100%
rename from lang/core/iter/map_func.go
rename to lang/core/iter/map.go
diff --git a/lang/core/list/list_concat_func.go b/lang/core/list/list_concat.go
similarity index 100%
rename from lang/core/list/list_concat_func.go
rename to lang/core/list/list_concat.go
diff --git a/lang/core/list/list_lookup_func.go b/lang/core/list/list_lookup.go
similarity index 100%
rename from lang/core/list/list_lookup_func.go
rename to lang/core/list/list_lookup.go
diff --git a/lang/core/local/pool_func.go b/lang/core/local/pool.go
similarity index 100%
rename from lang/core/local/pool_func.go
rename to lang/core/local/pool.go
diff --git a/lang/core/local/vardir_func.go b/lang/core/local/vardir.go
similarity index 100%
rename from lang/core/local/vardir_func.go
rename to lang/core/local/vardir.go
diff --git a/lang/core/map/map_lookup_func.go b/lang/core/map/map_lookup.go
similarity index 100%
rename from lang/core/map/map_lookup_func.go
rename to lang/core/map/map_lookup.go
diff --git a/lang/core/math/fortytwo_func.go b/lang/core/math/fortytwo.go
similarity index 100%
rename from lang/core/math/fortytwo_func.go
rename to lang/core/math/fortytwo.go
diff --git a/lang/core/math/minus1_func.go b/lang/core/math/minus1.go
similarity index 100%
rename from lang/core/math/minus1_func.go
rename to lang/core/math/minus1.go
diff --git a/lang/core/math/mod_func.go b/lang/core/math/mod.go
similarity index 100%
rename from lang/core/math/mod_func.go
rename to lang/core/math/mod.go
diff --git a/lang/core/math/pow_func.go b/lang/core/math/pow.go
similarity index 100%
rename from lang/core/math/pow_func.go
rename to lang/core/math/pow.go
diff --git a/lang/core/math/sqrt_func.go b/lang/core/math/sqrt.go
similarity index 100%
rename from lang/core/math/sqrt_func.go
rename to lang/core/math/sqrt.go
diff --git a/lang/core/math/sqrt_func_test.go b/lang/core/math/sqrt_test.go
similarity index 100%
rename from lang/core/math/sqrt_func_test.go
rename to lang/core/math/sqrt_test.go
diff --git a/lang/core/net/cidr_to_ip_func.go b/lang/core/net/cidr_to_ip.go
similarity index 100%
rename from lang/core/net/cidr_to_ip_func.go
rename to lang/core/net/cidr_to_ip.go
diff --git a/lang/core/net/cidr_to_ip_func_test.go b/lang/core/net/cidr_to_ip_test.go
similarity index 100%
rename from lang/core/net/cidr_to_ip_func_test.go
rename to lang/core/net/cidr_to_ip_test.go
diff --git a/lang/core/net/macfmt_func.go b/lang/core/net/macfmt.go
similarity index 100%
rename from lang/core/net/macfmt_func.go
rename to lang/core/net/macfmt.go
diff --git a/lang/core/net/macfmt_func_test.go b/lang/core/net/macfmt_test.go
similarity index 100%
rename from lang/core/net/macfmt_func_test.go
rename to lang/core/net/macfmt_test.go
diff --git a/lang/core/os/args_func.go b/lang/core/os/args.go
similarity index 100%
rename from lang/core/os/args_func.go
rename to lang/core/os/args.go
diff --git a/lang/core/os/distro_func.go b/lang/core/os/distro.go
similarity index 100%
rename from lang/core/os/distro_func.go
rename to lang/core/os/distro.go
diff --git a/lang/core/os/expand_home_func.go b/lang/core/os/expand_home.go
similarity index 100%
rename from lang/core/os/expand_home_func.go
rename to lang/core/os/expand_home.go
diff --git a/lang/core/os/family_func.go b/lang/core/os/family.go
similarity index 100%
rename from lang/core/os/family_func.go
rename to lang/core/os/family.go
diff --git a/lang/core/os/readfile_func.go b/lang/core/os/readfile.go
similarity index 100%
rename from lang/core/os/readfile_func.go
rename to lang/core/os/readfile.go
diff --git a/lang/core/os/system_func.go b/lang/core/os/system.go
similarity index 100%
rename from lang/core/os/system_func.go
rename to lang/core/os/system.go
diff --git a/lang/core/regexp/match_func.go b/lang/core/regexp/match.go
similarity index 100%
rename from lang/core/regexp/match_func.go
rename to lang/core/regexp/match.go
diff --git a/lang/core/regexp/match_func_test.go b/lang/core/regexp/match_test.go
similarity index 100%
rename from lang/core/regexp/match_func_test.go
rename to lang/core/regexp/match_test.go
diff --git a/lang/core/strings/pad_func.go b/lang/core/strings/pad.go
similarity index 100%
rename from lang/core/strings/pad_func.go
rename to lang/core/strings/pad.go
diff --git a/lang/core/strings/split_func.go b/lang/core/strings/split.go
similarity index 100%
rename from lang/core/strings/split_func.go
rename to lang/core/strings/split.go
diff --git a/lang/core/strings/split_func_test.go b/lang/core/strings/split_test.go
similarity index 100%
rename from lang/core/strings/split_func_test.go
rename to lang/core/strings/split_test.go
diff --git a/lang/core/strings/substring_func.go b/lang/core/strings/substring.go
similarity index 100%
rename from lang/core/strings/substring_func.go
rename to lang/core/strings/substring.go
diff --git a/lang/core/strings/to_lower_func.go b/lang/core/strings/to_lower.go
similarity index 100%
rename from lang/core/strings/to_lower_func.go
rename to lang/core/strings/to_lower.go
diff --git a/lang/core/strings/to_lower_func_test.go b/lang/core/strings/to_lower_test.go
similarity index 100%
rename from lang/core/strings/to_lower_func_test.go
rename to lang/core/strings/to_lower_test.go
diff --git a/lang/core/sys/env_func.go b/lang/core/sys/env.go
similarity index 100%
rename from lang/core/sys/env_func.go
rename to lang/core/sys/env.go
diff --git a/lang/core/value/get_func.go b/lang/core/value/get.go
similarity index 100%
rename from lang/core/value/get_func.go
rename to lang/core/value/get.go
diff --git a/lang/core/world/exchange_func.go b/lang/core/world/exchange.go
similarity index 100%
rename from lang/core/world/exchange_func.go
rename to lang/core/world/exchange.go
diff --git a/lang/core/world/getval_func.go b/lang/core/world/getval.go
similarity index 100%
rename from lang/core/world/getval_func.go
rename to lang/core/world/getval.go
diff --git a/lang/core/world/kvlookup_func.go b/lang/core/world/kvlookup.go
similarity index 100%
rename from lang/core/world/kvlookup_func.go
rename to lang/core/world/kvlookup.go
diff --git a/lang/core/world/schedule_func.go b/lang/core/world/schedule.go
similarity index 100%
rename from lang/core/world/schedule_func.go
rename to lang/core/world/schedule.go