naming convention rebuild