More corrections. Updated class names for the robot habitat