removed deprecated names