naming2 + mmanage.h refactor