adapted code and tests to module renaming