Naming convention corrections.