fix class name in module generation
Merge branch 'modules'