Changing most of the non-public vars to m-prefix