Changed field names in MachineShopSimulator because they made absolutely
no sense before. All tests pass.