#121 renamed 2 more plant classes