more renaming of ill-named functions