Changed field names in Job and Machine classes to clarify purpose. All
tests pass.