removed naming inconsistency