simplified the module names. fixes #244