renaming according to naming convention