Changed half the s_variables to sVariables

Half way done: Change to use camel case now