remove some deprecated names
Merge pull request #7 from escherba/dev

remove some deprecated names