Switched nomenclature for better readability