accounted for renames/new python mvm scripts
Merge branch 'master' into testing

* master:
  accounted for renames/new python mvm scripts