Fixed naming inconsistencies