Changed names to comply with OCD requirements

camelCase is superior to AllCaps and nocaps.