Add m_ and s_ prefixes for members