Changing variable names to not start with capital letter. Also replaced leading s_ with m_ for private, static member variables.