Some renaming on things