Fix nomenclature stuff