fixed more naming inconsistencies