Refactored simulation class names