revert to initial naming + fix import init
module name