More cleanup and renaming for plant.