fixed some variable names to fit conventions
Merge branch 'KanikaSandbox'
Merge branch 'GroupSandbox' of https://github.com/wallisc/Galaxy-Simulator.git