Fixed some naming issues
Merge branch '@Martin-P:fix/zend.module-manager.module-manager.rst' and Close #1359