Naming corrections