More naming overhaul