more renaming to keep consistency