diff --git a/moses-cmd/IOWrapper.cpp b/moses-cmd/IOWrapper.cpp
index 496254833..f11516839 100644
--- a/moses-cmd/IOWrapper.cpp
+++ b/moses-cmd/IOWrapper.cpp
@@ -369,7 +369,7 @@ void OutputNBest(std::ostream& out, const Moses::TrellisPathList &nBestList, con
   const StaticData &staticData = StaticData::Instance();
   bool labeledOutput = staticData.IsLabeledNBestList();
   bool reportAllFactors = staticData.GetReportAllFactorsNBest();
-  bool includeAlignment = staticData.NBestIncludesAlignment();
+  bool includeSegmentation = staticData.NBestIncludesSegmentation();
   bool includeWordAlignment = staticData.PrintAlignmentInfoInNbest();
 
   TrellisPathList::const_iterator iter;
@@ -432,8 +432,8 @@ void OutputNBest(std::ostream& out, const Moses::TrellisPathList &nBestList, con
     // total
     out << " ||| " << path.GetTotalScore();
 
-    //phrase-to-phrase alignment
-    if (includeAlignment) {
+    //phrase-to-phrase segmentation
+    if (includeSegmentation) {
       out << " |||";
       for (int currEdge = (int)edges.size() - 2 ; currEdge >= 0 ; currEdge--) {
         const Hypothesis &edge = *edges[currEdge];
diff --git a/moses/StaticData.h b/moses/StaticData.h
index 6052ab44d..c912c844f 100644
--- a/moses/StaticData.h
+++ b/moses/StaticData.h
@@ -439,7 +439,7 @@ public:
   bool IsLabeledNBestList() const {
     return m_labeledNBestList;
   }
-  bool NBestIncludesAlignment() const {
+  bool NBestIncludesSegmentation() const {
     return m_nBestIncludesSegmentation;
   }