refactoring and renaming and deprecations

see issue #115