Modified base directory names in preparation of MM build testing