Update simulation class

And fixed all camelCase and PascalCase cases