Clean up nomenclature a bit