Bugfixes for MO

To fix file naming conventions