naming convention cleanup