Minor form improvement
Some fixes after module name change