diff --git a/src/RideCacheModel.cpp b/src/RideCacheModel.cpp
index 62abd7966..0ad7f58f9 100644
--- a/src/RideCacheModel.cpp
+++ b/src/RideCacheModel.cpp
@@ -194,13 +194,13 @@ RideCacheModel::configChanged(qint32)
 
                     // is a metric
                     int i=section-5;
-                    headings_<< QString("X%1").arg(factory->metricName(i));
+                    headings_<< QString("%1").arg(factory->metricName(i));
 
                 } else {
 
                     // is a metadata
                     int i= section -5 - factory->metricCount();
-                    headings_<< QString("Z%1").arg(context->specialFields.makeTechName(metadata[i].name));
+                    headings_<< QString("%1").arg(context->specialFields.makeTechName(metadata[i].name));
                 }
             }
             break;
diff --git a/src/RideNavigator.cpp b/src/RideNavigator.cpp
index 01e753e94..d3587359f 100644
--- a/src/RideNavigator.cpp
+++ b/src/RideNavigator.cpp
@@ -268,7 +268,7 @@ RideNavigator::resetView()
         QString converted = QTextEdit(factory.rideMetric(factory.metricName(i))->name()).toPlainText();
 
         // from sql column name to friendly metric name
-        nameMap.insert(QString("X%1").arg(factory.metricName(i)), converted);
+        nameMap.insert(QString("%1").arg(factory.metricName(i)), converted);
 
         // from (english) internalName to (translated) Name
         internalNameMap.insert(factory.rideMetric(factory.metricName(i))->internalName(), converted);
@@ -281,7 +281,7 @@ RideNavigator::resetView()
     SpecialFields sp; // all the special fields are in here...
     foreach(FieldDefinition field, context->athlete->rideMetadata()->getFields()) {
         if (!sp.isMetric(field.name) && (field.type < 5 || field.type == 7)) {
-            nameMap.insert(QString("Z%1").arg(sp.makeTechName(field.name)), sp.displayName(field.name));
+            nameMap.insert(QString("%1").arg(sp.makeTechName(field.name)), sp.displayName(field.name));
             internalNameMap.insert(field.name, sp.displayName(field.name));
         }
     }
@@ -1265,6 +1265,11 @@ void NavigatorCellDelegate::paint(QPainter *painter, const QStyleOptionViewItem
     }
 }
 
+static bool insensitiveLessThan(const QString &a, const QString &b)
+{
+    return a.toLower() < b.toLower();
+}
+
 ColumnChooser::ColumnChooser(QList<QString>&logicalHeadings)
 {
     // wipe away everything when you close please...
@@ -1291,7 +1296,7 @@ ColumnChooser::ColumnChooser(QList<QString>&logicalHeadings)
     small.setPointSize(8);
 
     QList<QString> buttonNames = logicalHeadings;
-    qSort(buttonNames);
+    qSort(buttonNames.begin(), buttonNames.end(), insensitiveLessThan);
 
     foreach (QString column, buttonNames) {
 
diff --git a/src/RideNavigatorProxy.h b/src/RideNavigatorProxy.h
index cab12738b..70fd7cc28 100644
--- a/src/RideNavigatorProxy.h
+++ b/src/RideNavigatorProxy.h
@@ -114,7 +114,7 @@ public:
         tempIndex = -1;
         for(int i=0; i<model->columnCount(); i++) {
 
-            if (model->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString() == "Xaverage_temp") {
+            if (model->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString() == "average_temp") {
                 tempIndex = i;
             }
             if (model->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString() == "isRun") {
@@ -127,10 +127,7 @@ public:
             if (model->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString() == "color") {
                 colorColumn = i;
             }
-            if (model->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString() == "ZCalendar_Text") {
-                calendarText = i;
-            }
-            if (model->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString() == "Calendar Text") {
+            if (model->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString() == "Calendar_Text") {
                 calendarText = i;
             }
             if (model->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString() == "ride_date") {