Remove m prefixes from private variables

Also tweak a few incorrect comments while we're here

Change-Id: I0ef58fe68c60179c53ca6abca069b7b478bf6946
Merge "Remove m prefixes from private variables"