[REFACTORING] more renames