Fixed: CPT singular names
Added: 'Location' CPT