more renaming to follow coventions