backwards compatibility and remove ET_ from module class names