Fix naming inconsistency