some renaming to comply with style guide