Major naming overhaul