Improve consistency of nomenclature /cc @adkron