Renaming according to previous commit