diff --git a/common/fml_at.cfg b/common/fml_at.cfg
index 9631dbd835..7d06496047 100644
--- a/common/fml_at.cfg
+++ b/common/fml_at.cfg
@@ -1,75 +1,71 @@
 #Main FML Access Transformer configuration file
 # TileEntity addMapping
-public aji.a(Ljava/lang/Class;Ljava/lang/String;)V
+public aml.a(Ljava/lang/Class;Ljava/lang/String;)V
 # EntityList addMappings
-public jr.a(Ljava/lang/Class;Ljava/lang/String;I)V
-public jr.a(Ljava/lang/Class;Ljava/lang/String;III)V
+public le.a(Ljava/lang/Class;Ljava/lang/String;I)V
+public le.a(Ljava/lang/Class;Ljava/lang/String;III)V
 # EntityList nameToClassMap and idToClassMap and classToNameMap
-public jr.b
-public jr.d
-public jr.c
+public le.b
+public le.d
+public le.c
 # RenderEngine
-public avf.k # texturePack
+public azb.h # textureList
+public azb.k # texturePack
 # RenderManager renderers
-public avy.o
+public azv.o
 # RenderBlocks - everything
-public avg.*
-public avg.*()
-#RenderEngine - make TextureFX list public
-public avf.h
-public avf.k # texturePack
+public azc.*
+public azc.*()
 #RenderPlayer - make armorlist public and not final
-public-f awr.j
+public-f bap.h
 #StringTranslate - make the current table and language public
-public ak.b
-public ak.d
+public bd.b
+public bd.d
 # TileEntityRenderer - make the list of renderers public
-public axs.m
+public bbx.m
 # CraftingManager - make the add recipe methods public
-public td.a(Lrj;[Ljava/lang/Object;)V
-public td.b(Lrj;[Ljava/lang/Object;)V
+public vp.a(Ltu;[Ljava/lang/Object;)V
+public vp.b(Ltu;[Ljava/lang/Object;)V
 # WeightedRandomItem - make the "probability" public
-public is.a
+public kf.a
 # ItemStack - make itemId final
-#public+f rj.c
+#public+f tu.c
 # StatBase - Make statName public, no server side getter
-public hp.a
+public jb.a
 # NetLoginHandler make the "complete connection" callback public so I can reset it during FML negotiation
-public gx.a(Lgx;Z)Z
+public ij.a(Lij;Z)Z
 # NetLoginHandler userName field
-public gx.h
+public ij.h
 # EntityPlayerMP getNextWindowId
-public gu.bO()V
-public gu.cq
+public ig.cd()V
+public ig.cu
 # EntityAITaskEntry class -> public
-public kx
+public mn
 # EntityAITasks taskList
-public kw.a
+public mm.a
 # BlockChest isOcelotBlockingChest (a bounding box check actually)
-public afe.n(Lup;III)Z
+public ahy.n(Lxd;III)Z
 # EntityLiving
-public jw.aM # carryoverDamage
-# EntityLiving tasks
-public jw.bg
-# EntityAIOcelotSit nearestSittableBlock and isblocksittable
-protected li.a(Lup;III)Z
-protected li.f()Z
+public lm.aS # carryoverDamage
+public lm.bn # tasks
+public lm.bF # isJumping
+# EntityAIOcelotSit
+protected mz.a(Lxd;III)Z # nearestSittableBlock
+protected mz.f()Z # isblocksittable
 # CallableMinecraftVersion - sanity check the MC version
 public b
 public b.<init>(La;)V # constructor
 # EntityAnimal
-public mn.d # inLove
-# EntityLiving
-public jw.bu # isJumping
+public og.d # inLove
 # WorldType
-public va.<init>(ILjava/lang/String;)V
-public va.<init>(ILjava/lang/String;I)V
+public xo.<init>(ILjava/lang/String;)V
+public xo.<init>(ILjava/lang/String;I)V
 # ComponentVillage
-public aby
+public aep
 # EntityVillager - addbuy and addsell and minmax lists
-public od.a(Luj;ILjava/util/Random;F)V
-public od.b(Luj;ILjava/util/Random;F)V
-public od.bB
-public od.bC
+public qc.a(Lwv;ILjava/util/Random;F)V
+public qc.b(Lwv;ILjava/util/Random;F)V
+public qc.bO
+public qc.bP
 # GuiButtonMerchant
-public aqw
+public aul
diff --git a/common/fml_marker.cfg b/common/fml_marker.cfg
index eaabe3bdf3..fa3cc22e46 100644
--- a/common/fml_marker.cfg
+++ b/common/fml_marker.cfg
@@ -2,11 +2,11 @@
 # Only runs at runtime because it's not necessary at compile time
 # has deobf and obf mappings so it runs OK in mcp
 # entityplayer -> network/player
-og cpw/mods/fml/common/network/Player
+qf cpw/mods/fml/common/network/Player
 net.minecraft.src.EntityPlayer cpw/mods/fml/common/network/Player
 # block -> blockproxy
-aig cpw/mods/fml/common/registry/BlockProxy
+ale cpw/mods/fml/common/registry/BlockProxy
 net.minecraft.src.Block cpw/mods/fml/common/registry/BlockProxy
 # item -> itemproxy
-rh cpw/mods/fml/common/registry/ItemProxy
+ts cpw/mods/fml/common/registry/ItemProxy
 net.minecraft.src.Item cpw/mods/fml/common/registry/ItemProxy
\ No newline at end of file