Naming convention overhaul - incomplete