core naming convention cleanup