diff --git a/src/Common/com/bioxx/tfc/Core/TFC_ConfigGUI.java b/src/Common/com/bioxx/tfc/Core/TFC_ConfigGUI.java
index a4fd31a7e..31172e8ae 100644
--- a/src/Common/com/bioxx/tfc/Core/TFC_ConfigGUI.java
+++ b/src/Common/com/bioxx/tfc/Core/TFC_ConfigGUI.java
@@ -17,7 +17,7 @@ public class TFC_ConfigGUI extends GuiConfig
 {
 	public TFC_ConfigGUI(GuiScreen parent)
 	{
-		super(parent, getConfigElements(), Reference.ModID, false, false, "TFCOptions.cfg");
+		super(parent, getConfigElements(), Reference.ModID, false, false, "TFCConfig.cfg");
 	}
 
 	/** Compiles a list of config elements */
diff --git a/src/Common/com/bioxx/tfc/TerraFirmaCraft.java b/src/Common/com/bioxx/tfc/TerraFirmaCraft.java
index 6faa2e9a1..dd20d1c01 100644
--- a/src/Common/com/bioxx/tfc/TerraFirmaCraft.java
+++ b/src/Common/com/bioxx/tfc/TerraFirmaCraft.java
@@ -130,7 +130,17 @@ public void preInit(FMLPreInitializationEvent event)
 		//Load our settings from the TFCOptions file
 		try
 		{
-			config = new Configuration(new File(TerraFirmaCraft.proxy.getMinecraftDir(), "/config/TFCConfig.cfg"));
+			File newConfig = new File(TerraFirmaCraft.proxy.getMinecraftDir(), "/config/TFCConfig.cfg");
+			// If we are creating the new config for the first time, delete the old config file to help prevent confusion of having two similar files.
+			if (!newConfig.exists())
+			{
+				File oldConfig = new File(TerraFirmaCraft.proxy.getMinecraftDir(), "/config/TFCOptions.cfg");
+				if (oldConfig.exists() && !oldConfig.isDirectory())
+				{
+					oldConfig.delete();
+				}
+			}
+			config = new Configuration(newConfig);
 			config.load();
 		} catch (Exception e)
 		{