fixed names of type blocks, remove old Phalanx class