GA: minor renaming of functions for consistency