Remove fatal inconsistency in naming