diff --git a/misc/create-ini/PT.cpp b/misc/create-ini/PT.cpp
index e3bda8fd9..8d726ebb9 100644
--- a/misc/create-ini/PT.cpp
+++ b/misc/create-ini/PT.cpp
@@ -34,7 +34,7 @@ PT::PT(const std::string &line, int numFeatures, bool isHierarchical, const pair
   switch (implementation)
   {
   case 0: name = "PhraseDictionaryMemory"; break;
-  case 1: name = "PhraseDictionaryTreeAdaptor"; break;
+  case 1: name = "PhraseDictionaryBinary"; break;
   case 2: name = "PhraseDictionaryOnDisk"; break;
   case 6: name = "PhraseDictionaryMemory"; break;
   default:name = "UnknownPtImplementation"; break;
diff --git a/moses/Parameter.cpp b/moses/Parameter.cpp
index 4968c55fe..4264010cd 100644
--- a/moses/Parameter.cpp
+++ b/moses/Parameter.cpp
@@ -410,7 +410,7 @@ void Parameter::ConvertWeightArgsPhraseModel(const string &oldWeightName)
       numInputScores.push_back("1");
     }
 
-    SetWeight("PhraseDictionaryTreeAdaptor", 0, inputWeights);
+    SetWeight("PhraseDictionaryBinary", 0, inputWeights);
   }
 
   // convert actually pt feature
@@ -469,7 +469,7 @@ void Parameter::ConvertWeightArgsPhraseModel(const string &oldWeightName)
         ptType = "PhraseDictionaryMemory";
         break;
       case Binary:
-        ptType = "PhraseDictionaryTreeAdaptor";
+        ptType = "PhraseDictionaryBinary";
         break;
       case OnDisk:
         ptType = "PhraseDictionaryOnDisk";
diff --git a/moses/StaticData.cpp b/moses/StaticData.cpp
index c3ae048cc..14956b1b3 100644
--- a/moses/StaticData.cpp
+++ b/moses/StaticData.cpp
@@ -666,7 +666,7 @@ bool StaticData::LoadData(Parameter *parameter)
       SetWeights(model, weights);
       m_unknownWordPenaltyProducer = model;
     }
-    else if (feature == "PhraseDictionaryTreeAdaptor") {
+    else if (feature == "PhraseDictionaryBinary") {
       PhraseDictionaryTreeAdaptor* model = new PhraseDictionaryTreeAdaptor(line);
       vector<float> weights = m_parameter->GetWeights(model->GetScoreProducerDescription());
       SetWeights(model, weights);
diff --git a/moses/TranslationModel/PhraseDictionary.cpp b/moses/TranslationModel/PhraseDictionary.cpp
index fbb734357..51573499e 100644
--- a/moses/TranslationModel/PhraseDictionary.cpp
+++ b/moses/TranslationModel/PhraseDictionary.cpp
@@ -20,18 +20,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ***********************************************************************/
 
 #include "moses/TranslationModel/PhraseDictionary.h"
-#include "moses/TranslationModel/PhraseDictionaryTreeAdaptor.h"
-#include "moses/TranslationModel/RuleTable/PhraseDictionarySCFG.h"
-#include "moses/TranslationModel/RuleTable/PhraseDictionaryOnDisk.h"
-#include "moses/TranslationModel/RuleTable/PhraseDictionaryALSuffixArray.h"
-#include "moses/TranslationModel/RuleTable/PhraseDictionaryFuzzyMatch.h"
-
-#ifndef WIN32
-#include "moses/TranslationModel/PhraseDictionaryDynSuffixArray.h"
-#include "moses/TranslationModel/CompactPT/PhraseDictionaryCompact.h"
-#endif
-#include "moses/TranslationModel/RuleTable/UTrie.h"
-
 #include "moses/StaticData.h"
 #include "moses/InputType.h"
 #include "moses/TranslationOption.h"
diff --git a/moses/TranslationModel/PhraseDictionaryTreeAdaptor.cpp b/moses/TranslationModel/PhraseDictionaryTreeAdaptor.cpp
index 6a8e0150b..b5ebc107e 100644
--- a/moses/TranslationModel/PhraseDictionaryTreeAdaptor.cpp
+++ b/moses/TranslationModel/PhraseDictionaryTreeAdaptor.cpp
@@ -26,7 +26,7 @@ namespace Moses
 
 PhraseDictionaryTreeAdaptor::
 PhraseDictionaryTreeAdaptor(const std::string &line)
-  : PhraseDictionary("PhraseDictionaryTreeAdaptor", line)
+  : PhraseDictionary("PhraseDictionaryBinary", line)
 {
 }