diff --git a/src/main/resources/assets/betterfoliage/CropDefault.cfg b/src/main/resources/assets/betterfoliage/CropDefault.cfg
index bd95c37..8a5d4b7 100644
--- a/src/main/resources/assets/betterfoliage/CropDefault.cfg
+++ b/src/main/resources/assets/betterfoliage/CropDefault.cfg
@@ -7,8 +7,9 @@ net.minecraft.block.BlockDoublePlant
 -net.minecraft.block.BlockPotato
 
 // Biomes O'Plenty
-biomesoplenty.common.blocks.BlockBOPFlower
-biomesoplenty.common.blocks.BlockBOPFlower2
+biomesoplenty.common.block.BlockBOPFlower
+biomesoplenty.common.block.BlockBOPTurnip
+biomesoplenty.common.block.BlockBOPPlant
 
 // Tinkers' Construct
 tconstruct.blocks.slime.SlimeTallGrass
@@ -32,4 +33,4 @@ plantmegapack.block.PMPBlockWetlands
 com.pam.harvestcraft.BlockPamCrop
 com.pam.harvestcraft.BlockPamDesertGarden
 com.pam.harvestcraft.BlockPamNormalGarden
-com.pam.harvestcraft.BlockPamWaterGarden
\ No newline at end of file
+com.pam.harvestcraft.BlockPamWaterGarden
diff --git a/src/main/resources/assets/betterfoliage/DirtDefault.cfg b/src/main/resources/assets/betterfoliage/DirtDefault.cfg
index 21dff57..ee9a405 100644
--- a/src/main/resources/assets/betterfoliage/DirtDefault.cfg
+++ b/src/main/resources/assets/betterfoliage/DirtDefault.cfg
@@ -2,7 +2,7 @@
 net.minecraft.block.BlockDirt
 
 // Biomes O'Plenty
-biomesoplenty.common.blocks.BlockNewDirt
+biomesoplenty.common.block.BlockBOPDirt
 
 // Enhanced Biomes
 enhancedbiomes.blocks.BlockSoilEB
@@ -15,4 +15,4 @@ net.aetherteam.aether.blocks.natural.BlockAetherDirt
 com.gildedgames.aether.common.blocks.natural.BlockAetherDirt
 
 // Tinker's Construct
-slimeknights.tconstruct.world.block.BlockSlimeDirt
\ No newline at end of file
+slimeknights.tconstruct.world.block.BlockSlimeDirt
diff --git a/src/main/resources/assets/betterfoliage/GrassBlocksDefault.cfg b/src/main/resources/assets/betterfoliage/GrassBlocksDefault.cfg
index 2f44802..0366c8b 100644
--- a/src/main/resources/assets/betterfoliage/GrassBlocksDefault.cfg
+++ b/src/main/resources/assets/betterfoliage/GrassBlocksDefault.cfg
@@ -2,9 +2,7 @@
 net.minecraft.block.BlockGrass
 
 // Biomes O'Plenty
-biomesoplenty.common.blocks.BlockOriginGrass
-biomesoplenty.common.blocks.BlockLongGrass
-biomesoplenty.common.blocks.BlockNewGrass
+biomesoplenty.common.block.BlockBOPGrass
 
 // Tinker's Construct
 tconstruct.blocks.slime.SlimeGrass
@@ -16,4 +14,4 @@ enhancedbiomes.blocks.BlockGrassEB
 com.bioxx.tfc.Blocks.Terrain.BlockGrass
 
 // Aether
-net.aetherteam.aether.blocks.natural.BlockAetherGrass
\ No newline at end of file
+net.aetherteam.aether.blocks.natural.BlockAetherGrass
diff --git a/src/main/resources/assets/betterfoliage/LeavesBlocksDefault.cfg b/src/main/resources/assets/betterfoliage/LeavesBlocksDefault.cfg
index 23ede21..c876a40 100644
--- a/src/main/resources/assets/betterfoliage/LeavesBlocksDefault.cfg
+++ b/src/main/resources/assets/betterfoliage/LeavesBlocksDefault.cfg
@@ -1,2 +1,5 @@
 // Vanilla
-net.minecraft.block.BlockLeaves
\ No newline at end of file
+net.minecraft.block.BlockLeaves
+
+// Biomes O' Plenty
+biomesoplenty.common.block.BlockBOPLeaves
diff --git a/src/main/resources/assets/betterfoliage/LilypadDefault.cfg b/src/main/resources/assets/betterfoliage/LilypadDefault.cfg
index 4af6afd..1408f60 100644
--- a/src/main/resources/assets/betterfoliage/LilypadDefault.cfg
+++ b/src/main/resources/assets/betterfoliage/LilypadDefault.cfg
@@ -1,5 +1,8 @@
 // Vanilla
 net.minecraft.block.BlockLilyPad
 
+// Biomes O'Plenty
+biomesoplenty.common.block.BlockBOPLilypad
+
 // TerraFirmaCraft
-com.bioxx.tfc.Blocks.Vanilla.BlockCustomLilyPad
\ No newline at end of file
+com.bioxx.tfc.Blocks.Vanilla.BlockCustomLilyPad
diff --git a/src/main/resources/assets/betterfoliage/LogBlocksDefault.cfg b/src/main/resources/assets/betterfoliage/LogBlocksDefault.cfg
index ca9f809..4db4b8d 100644
--- a/src/main/resources/assets/betterfoliage/LogBlocksDefault.cfg
+++ b/src/main/resources/assets/betterfoliage/LogBlocksDefault.cfg
@@ -2,7 +2,7 @@
 net.minecraft.block.BlockLog
 
 // Biomes O'Plenty
-biomesoplenty.common.blocks.BlockBOPLog
+biomesoplenty.common.block.BlockBOPLog
 
 // Natura
 mods.natura.blocks.trees.DarkTreeBlock