Fix some naming inconsistencies