function name tweaks