fix naming inconsistencies