Rename Object to Obstacle, Scenery to Entity.