diff --git a/src/main/java/net/minecraftforge/common/PlantType.java b/src/main/java/net/minecraftforge/common/PlantType.java
index 0ee9c46474..6518f242f6 100644
--- a/src/main/java/net/minecraftforge/common/PlantType.java
+++ b/src/main/java/net/minecraftforge/common/PlantType.java
@@ -22,6 +22,7 @@ package net.minecraftforge.common;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorldReader;
 
+// TODO 1.16: This should not be an enum. Change it to ToolType instead
 public enum PlantType implements IExtensibleEnum
 {
     Plains,
diff --git a/src/test/java/net/minecraftforge/debug/block/CustomPlantTypeTest.java b/src/test/java/net/minecraftforge/debug/block/CustomPlantTypeTest.java
index 344c5f7844..f283180fd8 100644
--- a/src/test/java/net/minecraftforge/debug/block/CustomPlantTypeTest.java
+++ b/src/test/java/net/minecraftforge/debug/block/CustomPlantTypeTest.java
@@ -44,8 +44,8 @@ import net.minecraftforge.registries.ObjectHolder;
 public class CustomPlantTypeTest
 {
     static final String MODID = "custom_plant_type_test";
-    static final String CUSTOM_SOIL_BLOCK = "test_custom_block";
-    static final String CUSTOM_PLANT_BLOCK = "test_custom_plant";
+    private static final String CUSTOM_SOIL_BLOCK = "test_custom_block";
+    private static final String CUSTOM_PLANT_BLOCK = "test_custom_plant";
 
     @ObjectHolder(CUSTOM_SOIL_BLOCK)
     public static Block CUSTOM_SOIL;