diff --git a/client/src/collections/indicator_collection.coffee b/client/src/collections/indicator_collection.coffee
index 523b5c18..90fc5380 100644
--- a/client/src/collections/indicator_collection.coffee
+++ b/client/src/collections/indicator_collection.coffee
@@ -13,12 +13,12 @@ class Backbone.Collections.IndicatorCollection extends Backbone.Collection
       url += "?withData=true"
     url
 
-  filterByTitle: (title='') ->
-    title = title.trim()
+  filterByName: (name='') ->
+    name = name.trim()
 
-    regexp = new RegExp(".*#{title}.*", 'i')
+    regexp = new RegExp(".*#{name}.*", 'i')
     @filter( (indicator) ->
-      regexp.test indicator.get('title')
+      regexp.test indicator.get('name')
     )
 
   filterByTheme: (theme) ->
diff --git a/client/src/templates/indicator_selector_item.hbs b/client/src/templates/indicator_selector_item.hbs
index 51911392..bbc111d3 100644
--- a/client/src/templates/indicator_selector_item.hbs
+++ b/client/src/templates/indicator_selector_item.hbs
@@ -1,2 +1,2 @@
-<h4>{{short_name}}</h4>
-<p>{{title}}</p>
+<h4>{{shortName}}</h4>
+<p>{{name}}</p>
diff --git a/client/src/templates/report_edit_visualisation.hbs b/client/src/templates/report_edit_visualisation.hbs
index 1b513a1b..4d8e5527 100644
--- a/client/src/templates/report_edit_visualisation.hbs
+++ b/client/src/templates/report_edit_visualisation.hbs
@@ -1,7 +1,7 @@
 <div class="editor">
   <span class="close">{{{t "report/modal/close"}}}<i class="icon-remove-circle"></i></span>
   <header>
-    <h2>{{indicator.title}}</h2>
+    <h2>{{indicator.name}}</h2>
   </header>
   <div class="visualisation">
     <div class='controls'>
diff --git a/client/src/templates/table.hbs b/client/src/templates/table.hbs
index 9d96d73a..e359e7d5 100644
--- a/client/src/templates/table.hbs
+++ b/client/src/templates/table.hbs
@@ -1,5 +1,5 @@
 <table>
-  <caption>{{indicatorTitle}}</caption>
+  <caption>{{indicatorName}}</caption>
   <thead>
     <tr>
       <th>{{xAxis}}</th>
diff --git a/client/src/templates/visualisation.hbs b/client/src/templates/visualisation.hbs
index be239d1a..de33b46b 100644
--- a/client/src/templates/visualisation.hbs
+++ b/client/src/templates/visualisation.hbs
@@ -1,4 +1,4 @@
-<h4>{{indicator.title}}</h4>
+<h4>{{indicator.name}}</h4>
 
 {{#if isEditable}}
   <button class="delete delete-visualisation">
diff --git a/client/src/views/indicator_selector_view.coffee b/client/src/views/indicator_selector_view.coffee
index 54799372..1edb9fcb 100644
--- a/client/src/views/indicator_selector_view.coffee
+++ b/client/src/views/indicator_selector_view.coffee
@@ -8,7 +8,7 @@ class Backbone.Views.IndicatorSelectorView extends Backbone.Diorama.NestingView
   events:
     "click .close": "close"
     "click .clear-search": "clearSearch"
-    "keyup input": "filterByTitle"
+    "keyup input": "filterByName"
 
   initialize: (options = {}) ->
     @currentIndicator  = options.currentIndicator
@@ -55,7 +55,7 @@ class Backbone.Views.IndicatorSelectorView extends Backbone.Diorama.NestingView
 
     @filterIndicators()
 
-  filterByTitle: (event) =>
+  filterByName: (event) =>
     searchTerm = $(event.target).val()
 
     @updateClearSearchButton()
@@ -75,7 +75,7 @@ class Backbone.Views.IndicatorSelectorView extends Backbone.Diorama.NestingView
     results = @indicators.filterBySource(@filter.sourceName)
     @results.set(results)
 
-    results = @results.filterByTitle(@filter.searchTerm)
+    results = @results.filterByName(@filter.searchTerm)
     @textFilteredIndicators.reset(results)
     @results.set(results)
 
diff --git a/client/src/views/section_navigation_view.coffee b/client/src/views/section_navigation_view.coffee
index 4673ced0..bf6ed6c8 100644
--- a/client/src/views/section_navigation_view.coffee
+++ b/client/src/views/section_navigation_view.coffee
@@ -17,8 +17,8 @@ class Backbone.Views.SectionNavigationView extends Backbone.View
       sections: @sections.map (section)->
         title = section.get('title')
         if section.get('indicator')?
-          title = section.get('indicator').get('title')
-  
+          title = section.get('indicator').get('name')
+
         return {
           cid: section.cid
           _id: section.get('_id')
diff --git a/client/src/views/table_view.coffee b/client/src/views/table_view.coffee
index 8482b9c7..52e46c6f 100644
--- a/client/src/views/table_view.coffee
+++ b/client/src/views/table_view.coffee
@@ -24,7 +24,7 @@ class Backbone.Views.TableView extends Backbone.View
       xAxis: @visualisation.getXAxis()
       yAxis: @visualisation.getYAxis()
       dataRows: @visualisation.mapDataToXAndY()
-      indicatorTitle: @visualisation.get('indicator').get('title')
+      indicatorName: @visualisation.get('indicator').get('name')
     ))
 
   onClose: ->
diff --git a/client/test/src/models/section_model.coffee b/client/test/src/models/section_model.coffee
index 0a374c82..fa5a6e05 100644
--- a/client/test/src/models/section_model.coffee
+++ b/client/test/src/models/section_model.coffee
@@ -17,7 +17,7 @@ test("When intialising a section with a nested visualisation,
 
 test("When calling .toJSON on a section with an indicator model attribute,
   the indicator model should be deserialized to the indicator _id", ->
-  indicatorAttributes = _id: 5, title: 'hat'
+  indicatorAttributes = _id: 5, name: 'hat'
 
   section = new Backbone.Models.Section(indicator: indicatorAttributes)
   assert.equal section.toJSON().indicator, indicatorAttributes._id
@@ -56,7 +56,7 @@ test(".hasTitleOrIndicator returns true if there is a title present", ->
 )
 
 test(".hasTitleOrIndicator returns true if there is an indicator present", ->
-  section = new Backbone.Models.Section(indicator: {title: 'an indicator'})
+  section = new Backbone.Models.Section(indicator: {name: 'an indicator'})
 
   assert.ok section.hasTitleOrIndicator()
 )
@@ -81,12 +81,12 @@ test("When initialised with narrative attributes,
 
 test("When setting 'indicator' with indicator attributes,
   it creates a Backbone.Models.Indicator model in the indicator attribute", ->
-  indicatorAttributes = title: "I'm an indicator"
+  indicatorAttributes = name: "I'm an indicator"
   section = new Backbone.Models.Section()
   section.set('indicator', indicatorAttributes)
 
   assert.equal section.get('indicator').constructor.name, 'Indicator'
-  assert.equal section.get('indicator').get('title'), indicatorAttributes.title
+  assert.equal section.get('indicator').get('name'), indicatorAttributes.name
 )
 
 test(".save should actually call save on the parent page model", (done)->
diff --git a/client/test/src/models/visualisation_model.coffee b/client/test/src/models/visualisation_model.coffee
index defe5219..6769d88e 100644
--- a/client/test/src/models/visualisation_model.coffee
+++ b/client/test/src/models/visualisation_model.coffee
@@ -22,7 +22,7 @@ test('.toJSON returns the indicator: as indicator._id instead of the model attri
   visualisation = new Backbone.Models.Visualisation(
     indicator: {
       _id: indicatorId
-      title: 'hey'
+      name: 'hey'
     }
   )
 
@@ -200,7 +200,7 @@ test(".mapDataToXAndY should return data as an array of X and Y objects, with
     "Expected the formatted attribute to include the y axis"
 )
 
-test('.setFilterParameter when filter is undefined 
+test('.setFilterParameter when filter is undefined
   creates the object and insert the correct values', ->
   visualisation = Factory.visualisation()
 
diff --git a/client/test/src/views/indicator_selector_results_view.coffee b/client/test/src/views/indicator_selector_results_view.coffee
index 7494b187..a5c4fb5a 100644
--- a/client/test/src/views/indicator_selector_results_view.coffee
+++ b/client/test/src/views/indicator_selector_results_view.coffee
@@ -3,13 +3,13 @@ assert = chai.assert
 suite('IndicatorSelectorResultsView')
 
 test('renders an IndicatorSelectorItem sub view for each result in the given collection  ', ->
-  indicator = Factory.indicator(title: 'test indicator')
+  indicator = Factory.indicator(name: 'test indicator')
   indicators = new Backbone.Collections.IndicatorCollection([indicator])
 
   view = new Backbone.Views.IndicatorSelectorResultsView(indicators: indicators)
 
-  assert.match view.$el.text(), new RegExp(indicator.get('title')),
-    "Expected to see the indicator title"
+  assert.match view.$el.text(), new RegExp(indicator.get('name')),
+    "Expected to see the indicator name"
 
   for key, v of view.subViews
     subView = v
@@ -23,7 +23,7 @@ test('renders an IndicatorSelectorItem sub view for each result in the given col
 )
 
 test('re-renders when the indicator collection resets', ->
-  indicator = Factory.indicator(title: 'test indicator')
+  indicator = Factory.indicator(name: 'test indicator')
   indicators = new Backbone.Collections.IndicatorCollection([])
 
   view = new Backbone.Views.IndicatorSelectorResultsView(indicators: indicators)
@@ -33,8 +33,8 @@ test('re-renders when the indicator collection resets', ->
 
   indicators.reset([indicator])
 
-  assert.match view.$el.text(), new RegExp(indicator.get('title')),
-    "Expected to see the indicator title"
+  assert.match view.$el.text(), new RegExp(indicator.get('name')),
+    "Expected to see the indicator name"
 
   for key, v of view.subViews
     subView = v
diff --git a/client/test/src/views/indicator_selector_view.coffee b/client/test/src/views/indicator_selector_view.coffee
index bcc3e1ed..a84bd3ad 100644
--- a/client/test/src/views/indicator_selector_view.coffee
+++ b/client/test/src/views/indicator_selector_view.coffee
@@ -10,7 +10,7 @@ dummyFetch = ->
 test('populateCollections populates indicators from the server', (done)->
   server = sinon.fakeServer.create()
 
-  indicators = [title: 'hat']
+  indicators = [name: 'hat']
 
   indicatorSelector =
     indicators: new Backbone.Collections.IndicatorCollection([], withData: true)
@@ -20,7 +20,7 @@ test('populateCollections populates indicators from the server', (done)->
       Helpers.Assertions.assertPathVisited(server, new RegExp("/api/indicators"))
 
       assert.strictEqual(
-        indicatorSelector.indicators.at(0).get('title'), indicators[0].title
+        indicatorSelector.indicators.at(0).get('name'), indicators[0].name
       )
 
       done()
@@ -46,8 +46,8 @@ test('.initialize populates the indicators collection,
     _id: Factory.findNextFreeId('Section')
   )
 
-  indicatorTitle = 'An indicator'
-  indicators = [{_id: 1, title: indicatorTitle}]
+  indicatorName = 'An indicator'
+  indicators = [{_id: 1, name: indicatorName}]
 
   @stub(Backbone.Collections.IndicatorCollection::, 'fetch', ->
     Helpers.promisify(=>
@@ -86,7 +86,7 @@ test('Renders a ThemeFilters sub view with the collection of indicators', sinon.
     _id: Factory.findNextFreeId('Section')
   )
 
-  indicators = [{_id: 1, title: "Such Theme"}]
+  indicators = [{_id: 1, name: "Such Indicator"}]
 
   @stub(Backbone.Collections.IndicatorCollection::, 'fetch', ->
     Helpers.promisify(=>
@@ -154,10 +154,10 @@ test("When 'indicator_selector:theme_selected' is triggered,
 
 test('When `indicator_selector:indicator_selected` event is fired on backbone
  it triggers the `indicatorSelected` event on itself', (done)->
-  indicatorText = 'hats'
+  indicatorName = 'hats'
   indicatorAttributes = [{
     type: 'cartodb'
-    title: indicatorText
+    name: indicatorName
   }]
 
   sandbox = sinon.sandbox.create()
@@ -177,7 +177,7 @@ test('When `indicator_selector:indicator_selected` event is fired on backbone
 
   indicatorSelectedCallback = (indicator) ->
     try
-      assert.strictEqual indicator.get('title'), indicatorText
+      assert.strictEqual indicator.get('name'), indicatorName
       done()
     catch err
       done(err)
@@ -223,8 +223,8 @@ test(".filterByTheme given a theme sets the results object to only
   assert.isTrue collectionFilterByThemeStub.calledWith(filterTheme)
 )
 
-test(".filterByTitle given an input event sets the results object to only
- indicators with a matching title", ->
+test(".filterByName given an input event sets the results object to only
+ indicators with a matching name", ->
   view =
     indicators: new Backbone.Collections.IndicatorCollection([])
     results: new Backbone.Collections.IndicatorCollection()
@@ -234,30 +234,30 @@ test(".filterByTitle given an input event sets the results object to only
 
   event = target: '<input value="hats and boats and cats">'
 
-  filterTitleIndicator = Factory.indicator()
-  collectionFilterByTitleStub = sinon.stub(
-    Backbone.Collections.IndicatorCollection::, 'filterByTitle', ->
-      return [filterTitleIndicator]
+  filterNameIndicator = Factory.indicator()
+  collectionfilterByNameStub = sinon.stub(
+    Backbone.Collections.IndicatorCollection::, 'filterByName', ->
+      return [filterNameIndicator]
   )
 
-  Backbone.Views.IndicatorSelectorView::filterByTitle.call(
+  Backbone.Views.IndicatorSelectorView::filterByName.call(
     view, event
   )
 
   try
     assert.ok(
-      collectionFilterByTitleStub.calledOnce,
-      "Expected filterByTitle to be called once but was called
-        #{collectionFilterByTitleStub.callCount} times"
+      collectionfilterByNameStub.calledOnce,
+      "Expected filterByName to be called once but was called
+        #{collectionfilterByNameStub.callCount} times"
     )
 
     assert.lengthOf view.results.models, 1,
       "Expected the collection to be filtered to only the correct indicator"
 
-    assert.deepEqual view.results.at(0), filterTitleIndicator,
+    assert.deepEqual view.results.at(0), filterNameIndicator,
       "Expected the result indicator to be the correct one for the given theme"
   finally
-    collectionFilterByTitleStub.restore()
+    collectionfilterByNameStub.restore()
 )
 
 test('.filterBySource sets a sourceName attribute on the @filter', ->
@@ -276,7 +276,7 @@ test('.filterBySource sets a sourceName attribute on the @filter', ->
     "Expected filterIndicators to be called with the new filters"
 )
 
-test("When the data origin sub view triggers 'selected', 
+test("When the data origin sub view triggers 'selected',
  filterBySource is triggered", sinon.test(->
 
   section = new Backbone.Models.Section(
@@ -345,7 +345,7 @@ sinon.test(->
 
   theme = Factory.theme()
   matchingIndicator = Factory.indicator(
-    title: "Matching title, theme and type"
+    name: "Matching name, theme and type"
     theme: theme.get('_id')
     source: name: 'cygnet'
   )
@@ -353,14 +353,14 @@ sinon.test(->
   indicators = [
     matchingIndicator
     {
-      title: "Matching title and theme only", theme: theme.get('_id')}
+      name: "Matching name and theme only", theme: theme.get('_id')}
     {
-      title: "Matches theme and source only",
+      name: "Matches theme and source only",
       theme: theme.get('_id'),
       source: name: 'cygnet'
     },
     {
-      title: "Matching title and source only",
+      name: "Matching name and source only",
       theme: Factory.findNextFreeId('Theme'),
       source: name: 'cygnet'
     }
@@ -378,7 +378,7 @@ sinon.test(->
   )
 
   view.filterByTheme(theme)
-  view.filterByTitle({target: '<input value="Matching">'})
+  view.filterByName({target: '<input value="Matching">'})
   view.filterBySource('cygnet')
 
   try
diff --git a/client/test/src/views/report_edit_visualisation_view.coffee b/client/test/src/views/report_edit_visualisation_view.coffee
index aa9ee967..43435c9b 100644
--- a/client/test/src/views/report_edit_visualisation_view.coffee
+++ b/client/test/src/views/report_edit_visualisation_view.coffee
@@ -8,10 +8,10 @@ createAndShowVisualisationViewForOptions = (options) ->
 
 suite('ReportEditVisualisationView')
 
-test("Shows the given indicator title", ->
-  indicatorTitle = "my lovely indicator"
+test("Shows the given indicator name", ->
+  indicatorName = "my lovely indicator"
   indicator = Factory.indicator()
-  indicator.set('title', indicatorTitle)
+  indicator.set('name', indicatorName)
 
   section = new Backbone.Models.Section(
     indicator: indicator
@@ -26,7 +26,7 @@ test("Shows the given indicator title", ->
 
   assert.match(
     $('#test-container').text(),
-    new RegExp(".*#{indicatorTitle}.*")
+    new RegExp(".*#{indicatorName}.*")
   )
   view.close()
 )
diff --git a/client/test/src/views/table_view.coffee b/client/test/src/views/table_view.coffee
index 12fd417f..559e90fe 100644
--- a/client/test/src/views/table_view.coffee
+++ b/client/test/src/views/table_view.coffee
@@ -60,7 +60,7 @@ test('Should render formatted visualisation data into a table', ->
     indicatorDefinition:
       xAxis: 'year'
       yAxis: 'value'
-    title: 'An indicatr'
+    name: 'An indicator'
   )
 
   view = new Backbone.Views.TableView(visualisation: visualisation)
@@ -68,7 +68,7 @@ test('Should render formatted visualisation data into a table', ->
 
   assert.strictEqual(
     $('#test-container').find('table caption').text(),
-    indicator.get('title')
+    indicator.get('name')
   )
 
   headerText = $('#test-container').find('table thead').text()
diff --git a/client/test/src/views/visualisation_view.coffee b/client/test/src/views/visualisation_view.coffee
index dd281216..a5657006 100644
--- a/client/test/src/views/visualisation_view.coffee
+++ b/client/test/src/views/visualisation_view.coffee
@@ -8,9 +8,9 @@ createAndShowVisualisationViewForVisualisation = (visualisation) ->
 
 suite('Visualisation View')
 
-test("Shows the title of the indicator", ->
+test("Shows the name of the indicator", ->
   indicator = Factory.indicator(
-    title: "Such indicator"
+    name: "Such indicator"
   )
 
   view = new Backbone.Views.VisualisationView(
@@ -23,8 +23,8 @@ test("Shows the title of the indicator", ->
 
   assert.match(
     view.$el.find('h4').text(),
-    new RegExp(".*#{indicator.get('title')}.*"),
-    "Expected to see the indicator title"
+    new RegExp(".*#{indicator.get('name')}.*"),
+    "Expected to see the indicator name"
   )
 
   view.close()
diff --git a/server/components/indicatorator/README.md b/server/components/indicatorator/README.md
index e7be0964..92c309ce 100644
--- a/server/components/indicatorator/README.md
+++ b/server/components/indicatorator/README.md
@@ -76,7 +76,7 @@ These 3 components can be extracted from an esri rest URL, like so:
 #### gdocs
 
 For indicator data stored in 'google' docs, your indicator definitions need to
-include a `spreadsheet_key` attribute. The spreadsheet in question must be
+include a `spreadsheetKey` attribute. The spreadsheet in question must be
 public *and* 'published for web' from the 'File -> publish for web' in google
 docs.
 
@@ -120,12 +120,12 @@ Docs](https://docs.google.com/spreadsheet/ccc?key=0Aum2hJfH1Ze0dGtybGNCeUdTNFk1Y
 
 #### applyRanges: (true)
 By default, indicatoration applies text values to raw indicator data, using the
-ranges specified in the 'range' attribute. If you don't want this to happen, 
+ranges specified in the 'range' attribute. If you don't want this to happen,
 specify applyRanges: false
 
 #### reduceField: (null)
 Basic sub indicator support is implemented by allowing grouping on a text field.
 For example, if you had a collection of data for the same year but for different
-monitoring stations, specify the group field here, e.g. 'station' to have the 
+monitoring stations, specify the group field here, e.g. 'station' to have the
 data grouped on the station, by periodStart
 
diff --git a/server/components/indicatorator/getters/cartodb.coffee b/server/components/indicatorator/getters/cartodb.coffee
index 3cfcd0d2..e85b39a5 100644
--- a/server/components/indicatorator/getters/cartodb.coffee
+++ b/server/components/indicatorator/getters/cartodb.coffee
@@ -33,7 +33,7 @@ module.exports = class CartoDBGetter
     table_name = @indicator.indicatorationConfig.cartodb_config.table_name
     query = """
       SELECT * FROM #{table_name}
-      WHERE field_2 = '#{@indicator.short_name}'
+      WHERE field_2 = '#{@indicator.shortName}'
       OR field_1 = 'Theme'
     """
 
diff --git a/server/components/indicatorator/getters/gdoc.coffee b/server/components/indicatorator/getters/gdoc.coffee
index 43b1c38f..823d57db 100644
--- a/server/components/indicatorator/getters/gdoc.coffee
+++ b/server/components/indicatorator/getters/gdoc.coffee
@@ -7,13 +7,13 @@ module.exports = class GDoc
   fetch: ->
     new Promise( (resolve, reject) =>
       @queryGoogleSpreadsheet(
-        key: @indicator.indicatorationConfig.spreadsheet_key
+        key: @indicator.indicatorationConfig.spreadsheetKey
       ).then( (spreadsheet) =>
 
         spreadsheet.worksheets[0].cells({}, (err, cells) =>
           headers = cells.cells['1']
           indicatorData = _.filter(cells.cells, (row) =>
-            row['2'].value is @indicator.short_name
+            row['2'].value is @indicator.shortName
           )
 
           resolve({
diff --git a/server/components/indicatorator/lib/range_applicator.coffee b/server/components/indicatorator/lib/range_applicator.coffee
index 124f0ab6..2e89feda 100644
--- a/server/components/indicatorator/lib/range_applicator.coffee
+++ b/server/components/indicatorator/lib/range_applicator.coffee
@@ -21,6 +21,6 @@ calculateIndicatorText = (value, ranges) ->
   value = parseFloat(value)
 
   for range in ranges
-    return range.message if value >= range.minValue
+    return range.text if value >= range.threshold
 
   return "Error: Value #{value} outside expected range"
diff --git a/server/components/indicatorator/test/getters/cartodb.coffee b/server/components/indicatorator/test/getters/cartodb.coffee
index 94e5d84a..a347d60f 100644
--- a/server/components/indicatorator/test/getters/cartodb.coffee
+++ b/server/components/indicatorator/test/getters/cartodb.coffee
@@ -129,7 +129,7 @@ test('.buildUrl throws an error if the Indicator cartodb_config does not specify
 
 test('.buildUrl constructs the correct URL with username and query', ->
   indicator = new Indicator(
-    short_name: "CO 2"
+    shortName: "CO 2"
     indicatorationConfig:
       cartodb_config:
         username: 'someguy'
diff --git a/server/components/indicatorator/test/getters/gdoc.coffee b/server/components/indicatorator/test/getters/gdoc.coffee
index b1df9d71..a86d0f92 100644
--- a/server/components/indicatorator/test/getters/gdoc.coffee
+++ b/server/components/indicatorator/test/getters/gdoc.coffee
@@ -22,9 +22,9 @@ test("GDoc stores a reference to the given indicator", ->
 test("GDoc getter takes an Indicator and queries Google Spreadsheets
   with the indicator's spreadsheet id", (done) ->
   indicator = new Indicator(
-    short_name: 'Key stakeholders identified'
+    shortName: 'Key stakeholders identified'
     indicatorationConfig:
-      spreadsheet_key: '123'
+      spreadsheetKey: '123'
   )
 
   expectedData = {
@@ -88,9 +88,9 @@ test("GDoc getter takes an Indicator and queries Google Spreadsheets
 
 test(".fetch returns all rows of a sub indicator", (done) ->
   indicator = new Indicator(
-    short_name: 'Key stakeholders identified'
+    shortName: 'Key stakeholders identified'
     indicatorationConfig:
-      spreadsheet_key: '123'
+      spreadsheetKey: '123'
   )
 
   expectedData = {
diff --git a/server/components/indicatorator/test/lib/range_applicator.coffee b/server/components/indicatorator/test/lib/range_applicator.coffee
index 53d70367..bcc7590b 100644
--- a/server/components/indicatorator/test/lib/range_applicator.coffee
+++ b/server/components/indicatorator/test/lib/range_applicator.coffee
@@ -14,9 +14,9 @@ adds a 'text' attribute with the correct values based on the range", ->
   ]
 
   ranges = [
-    {"minValue": 1000, "message": "Excellent"},
-    {"minValue": 500, "message": "Moderate"},
-    {"minValue": 0, "message": "Poor"}
+    {threshold: 1000, text: "Excellent"},
+    {threshold: 500, text: "Moderate"},
+    {threshold: 0, text: "Poor"}
   ]
 
   rangedData = RangeApplicator.applyRanges(data, ranges)
@@ -52,9 +52,9 @@ adds a 'text' to both the indicator and subindicators", ->
   }]
 
   ranges = [
-    {"minValue": 0.7, "message": "Excellent"},
-    {"minValue": 0.2, "message": "Moderate"},
-    {"minValue": 0, "message": "Poor"}
+    {threshold: 0.7, text: "Excellent"},
+    {threshold: 0.2, text: "Moderate"},
+    {threshold: 0, text: "Poor"}
   ]
 
   rangedData = RangeApplicator.applyRanges(data, ranges)
diff --git a/server/config/instances/abu_dhabi/seeds/indicators.json b/server/config/instances/abu_dhabi/seeds/indicators.json
index 970fef2d..afe8bdc1 100644
--- a/server/config/instances/abu_dhabi/seeds/indicators.json
+++ b/server/config/instances/abu_dhabi/seeds/indicators.json
@@ -1,6 +1,6 @@
 [{
-  "short_name": "GHG Emission",
-  "title": "Total GHG emissions as % of year 2010 level of emissions",
+  "shortName": "GHG Emission",
+  "name": "Total GHG emissions as % of year 2010 level of emissions",
   "theme": "Air Quality",
   "sections": [
     {"title": "Description", "content": "Total GHG emissions as % of year 2010 level of emissions"}
@@ -14,8 +14,8 @@
   "indicatorDefinition": {
   }
 }, {
-  "short_name": "CO Concentration",
-  "title": "Average annual CO concentration in µg per m3",
+  "shortName": "CO Concentration",
+  "name": "Average annual CO concentration in µg per m3",
   "theme": "Air Quality",
   "sections": [
     {"title": "Description", "content": "Average annual CO concentration in µg per m3"}
@@ -45,7 +45,7 @@
   },
   "indicatorDefinition": {
     "unit": "stations",
-    "short_unit": "stations",
+    "shortUnit": "stations",
     "period": "quarterly",
     "xAxis": "date",
     "yAxis": "value",
@@ -87,8 +87,8 @@
     ]
   }
 }, {
-  "short_name": "NO2 Concentration",
-  "title": "Average annual NO2 concentration in µg per m3",
+  "shortName": "NO2 Concentration",
+  "name": "Average annual NO2 concentration in µg per m3",
   "theme": "Air Quality",
   "sections": [
     {"title": "Description", "content": "Average annual NO2 concentration in µg per m3"}
@@ -118,7 +118,7 @@
   },
   "indicatorDefinition": {
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -160,8 +160,8 @@
       ]
   }
 }, {
-  "short_name": "SO2 Concentration",
-  "title": "Hourly average SO2 concentration in µg per m3",
+  "shortName": "SO2 Concentration",
+  "name": "Hourly average SO2 concentration in µg per m3",
   "theme": "Air Quality",
   "sections": [
     {"title": "Description", "content": "Hourly average SO2 concentration in µg per m3"}
@@ -191,7 +191,7 @@
   },
   "indicatorDefinition": {
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -233,8 +233,8 @@
       ]
   }
 },{
-  "short_name": "PM10 Concentration",
-  "title": "Daily average PM10 concentration in µg per m3",
+  "shortName": "PM10 Concentration",
+  "name": "Daily average PM10 concentration in µg per m3",
   "theme": "Air Quality",
   "sections": [
     {"title": "Description", "content": "Daily average PM10 concentration in µg per m3"}
@@ -264,7 +264,7 @@
   },
   "indicatorDefinition": {
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -306,8 +306,8 @@
       ]
   }
 },{
-  "short_name": "PM25 Concentration",
-  "title": "Annual average PM25 concentration in µg per m3",
+  "shortName": "PM25 Concentration",
+  "name": "Annual average PM25 concentration in µg per m3",
   "theme": "Air Quality",
   "sections": [
     {"title": "Description", "content": "Annual average PM25 concentration in µg per m3"}
@@ -329,7 +329,7 @@
       "serviceName": "NRT_AD_AirQuality",
       "featureServer": -1,
       "unit": "µg per m3",
-      "short_unit": "µg/m3",
+      "shortUnit": "µg/m3",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -362,8 +362,8 @@
       ]
   }
 },{
-  "short_name": "O3 Concentration",
-  "title": "1-hr and 8-hr O3 concentration in µg per m3",
+  "shortName": "O3 Concentration",
+  "name": "1-hr and 8-hr O3 concentration in µg per m3",
   "theme": "Air Quality",
   "sections": [
     {"title": "Description", "content": "Daily average PM10 concentration in µg per m3"}
@@ -393,7 +393,7 @@
   },
   "indicatorDefinition": {
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -435,8 +435,8 @@
       ]
   }
 },{
-  "short_name": "Protected areas",
-  "title": "Protected Area as a Percent of Total area",
+  "shortName": "Protected areas",
+  "name": "Protected Area as a Percent of Total area",
 
   "theme": "Biodiversity",
   "sections": [
@@ -467,7 +467,7 @@
   },
   "indicatorDefinition": {
       "unit": "%",
-      "short_unit": "%",
+      "shortUnit": "%",
       "period": "annual",
       "xAxis": "date",
       "yAxis": "value",
@@ -500,8 +500,8 @@
       ]
     }
 }, {
-  "short_name": "Area of Key Ecosystems",
-  "title": "Area of Selected Key Ecosystems as a Percent of Total Area",
+  "shortName": "Area of Key Ecosystems",
+  "name": "Area of Selected Key Ecosystems as a Percent of Total Area",
   "theme": "Biodiversity",
   "sections": [
     {"title": "Description", "content": "Area of Selected Key Ecosystems as a Percent of Total Area"}
@@ -522,8 +522,8 @@
   "indicatorDefinition": {
   }
 },{
-  "short_name": "Threatened species",
-  "title": "Percentage of Threatened Species",
+  "shortName": "Threatened species",
+  "name": "Percentage of Threatened Species",
   "description": "Number of species at risk of extinction in proportion to the total number of native species.",
   "theme": "Biodiversity",
   "indicatorDefinition": {
@@ -548,8 +548,8 @@
       ]
     }
 }, {
-  "short_name": "Abundance of Key Species",
-  "title": "Abundance of Selected Key Species",
+  "shortName": "Abundance of Key Species",
+  "name": "Abundance of Selected Key Species",
   "theme": "Biodiversity",
   "sections": [
     {"title": "Description", "content": "Abundance of Selected Key Species"}
@@ -570,8 +570,8 @@
   "indicatorDefinition": {
   }
 },{
-  "short_name": "Fish Resource Status",
-  "title": "Annual fish catch from sustainable fisheries",
+  "shortName": "Fish Resource Status",
+  "name": "Annual fish catch from sustainable fisheries",
   "theme": "Productive Natural Resources",
   "sections": [
     {"title": "Description", "content": "Annual fish catch from sustainable fisheries"}
@@ -592,8 +592,8 @@
   "indicatorDefinition": {
   }
 }, {
-  "short_name": "Ammonia",
-  "title": "Ammonia",
+  "shortName": "Ammonia",
+  "name": "Ammonia",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": ""}
@@ -623,7 +623,7 @@
   },
   "indicatorDefinition": {
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -665,8 +665,8 @@
       ]
   }
 }, {
-  "short_name": "Coastal Chlorophyll",
-  "title": "Coastal Chlorophyll",
+  "shortName": "Coastal Chlorophyll",
+  "name": "Coastal Chlorophyll",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": ""}
@@ -696,7 +696,7 @@
   },
   "indicatorDefinition": {
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -738,8 +738,8 @@
       ]
   }
 }, {
-  "short_name": "Dissolved Oxygen",
-  "title": "Dissolved Oxygen",
+  "shortName": "Dissolved Oxygen",
+  "name": "Dissolved Oxygen",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": ""}
@@ -769,7 +769,7 @@
   },
   "indicatorDefinition": {
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -811,8 +811,8 @@
       ]
   }
 }, {
-  "short_name": "Nitrate-N Concentrations",
-  "title": "Nitrate –N concentration in coastal waters (µg per L)",
+  "shortName": "Nitrate-N Concentrations",
+  "name": "Nitrate –N concentration in coastal waters (µg per L)",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": "Area of Selected Key Ecosystems as a Percent of Total Area"}
@@ -842,7 +842,7 @@
   },
   "indicatorDefinition": {
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -884,8 +884,8 @@
       ]
   }
 }, {
-  "short_name": "Phosphate P",
-  "title": "Phosphate P",
+  "shortName": "Phosphate P",
+  "name": "Phosphate P",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": ""}
@@ -915,7 +915,7 @@
   },
   "indicatorDefinition": {
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -957,8 +957,8 @@
       ]
   }
 }, {
-  "short_name": "Enterococci Concentrations",
-  "title": "Enterococci concentration in 100 ml of coastal waters",
+  "shortName": "Enterococci Concentrations",
+  "name": "Enterococci concentration in 100 ml of coastal waters",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": "Enterococci concentration in 100 ml of coastal waters"}
@@ -987,7 +987,7 @@
   },
   "indicatorDefinition": {
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -1029,8 +1029,8 @@
       ]
   }
 }, {
-  "short_name": "Groundwater Reserves",
-  "title": "Effective years remaining in usable groundwater reserves",
+  "shortName": "Groundwater Reserves",
+  "name": "Effective years remaining in usable groundwater reserves",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": "Effective years remaining in usable groundwater reserves"}
@@ -1051,8 +1051,8 @@
   "indicatorDefinition": {
   }
 }, {
-  "short_name": "Salinity",
-  "title": "Area (km2) of aquifer where water quality is <= 1500 ppm TDS concentration",
+  "shortName": "Salinity",
+  "name": "Area (km2) of aquifer where water quality is <= 1500 ppm TDS concentration",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": "Area (km2) of aquifer where water quality is less than or equal to 1500 ppm TDS concentration"}
@@ -1073,8 +1073,8 @@
   "indicatorDefinition": {
   }
 },{
-  "short_name": "Awareness of Water",
-  "title": "Awareness on ground water depletion and high domestic water consumption",
+  "shortName": "Awareness of Water",
+  "name": "Awareness on ground water depletion and high domestic water consumption",
   "theme": "Environmental Awareness",
   "sections": [
     {"title": "Description", "content": "Awareness on ground water depletion and high domestic water consumption"}
@@ -1095,8 +1095,8 @@
   "indicatorDefinition": {
   }
 },{
-  "short_name": "Awareness of Fish Stocks",
-  "title": "Awareness on diminishing fish stock",
+  "shortName": "Awareness of Fish Stocks",
+  "name": "Awareness on diminishing fish stock",
   "theme": "Environmental Awareness",
   "sections": [
     {"title": "Description", "content": "Awareness on diminishing fish stock"}
@@ -1117,8 +1117,8 @@
   "indicatorDefinition": {
   }
 },{
-  "short_name": "Awareness of air quality",
-  "title": "Awareness on air quality (indoor and outdoor) & noise pollution",
+  "shortName": "Awareness of air quality",
+  "name": "Awareness on air quality (indoor and outdoor) & noise pollution",
   "theme": "Environmental Awareness",
   "sections": [
     {"title": "Description", "content": "Awareness on air quality (indoor and outdoor) & noise pollution"}
@@ -1139,8 +1139,8 @@
   "indicatorDefinition": {
   }
 },{
-  "short_name": "Awareness of biodiversity",
-  "title": "Awareness on Biodiversity (marine and terrestrial",
+  "shortName": "Awareness of biodiversity",
+  "name": "Awareness on Biodiversity (marine and terrestrial",
   "theme": "Environmental Awareness",
   "sections": [
     {"title": "Description", "content": "Awareness on Biodiversity (marine and terrestrial"}
@@ -1164,14 +1164,14 @@
 
 
 {
-  "short_name": "Urban air pollution",
-  "title": "Ambient Concentration of Air Pollutants in Urban Areas",
+  "shortName": "Urban air pollution",
+  "name": "Ambient Concentration of Air Pollutants in Urban Areas",
   "description": "Ambient air pollution concentrations of ozone, particulate matter (PM10, and PM2,5, if those are not available: SPM, black smoke), sulfur dioxide, nitrogen dioxide, lead. Additional:  carbon monoxide, volatile organic compounds including benzene (VOCs). The priority is collection of the indicator in large cities (over 1 million population).",
   "theme": "Air Quality",
   "indicatorDefinition": {
       "sourceUrl": "/MapThemes/TerrestrialHabitat/MapServer/14",
       "operation": "sum",
-      "short_unit": "µg/m3",
+      "shortUnit": "µg/m3",
       "unit": "µg/m3, ppm or ppb, as appropriate",
       "outFields": "shape.area",
       "dateField": "datedes",
@@ -1191,14 +1191,14 @@
       ]
     }
 }, {
-  "short_name": "Red List species",
-  "title": "Abu Dhabi Red List Indices For All Species Groups",
+  "shortName": "Red List species",
+  "name": "Abu Dhabi Red List Indices For All Species Groups",
   "description": "",
   "theme": "Biodiversity",
   "indicatorDefinition": {
       "sourceUrl": "/MapThemes/TerrestrialHabitat/MapServer/14",
       "operation": "sum",
-      "short_unit": "",
+      "shortUnit": "",
       "unit": "",
       "outFields": "shape.area",
       "dateField": "datedes",
@@ -1218,14 +1218,14 @@
       ]
     }
 }, {
-  "short_name": "Annual Fish Catch",
-  "title": "Abu Dhabi Red List Indices For All Species Groups",
+  "shortName": "Annual Fish Catch",
+  "name": "Abu Dhabi Red List Indices For All Species Groups",
   "description": "Annual catch of major species in relation to spawning biomass if available or in relation to the year of maximum catches in the time series.",
   "theme": "Productive Natural Resources",
   "indicatorDefinition": {
       "sourceUrl": "/MapThemes/TerrestrialHabitat/MapServer/14",
       "operation": "sum",
-      "short_unit": "t",
+      "shortUnit": "t",
       "unit": "metric tons",
       "outFields": "shape.area",
       "dateField": "datedes",
@@ -1245,8 +1245,8 @@
       ]
     }
 }, {
-  "short_name": "World Bank PA cover",
-  "title": "Protected Area coverage (World Bank)",
+  "shortName": "World Bank PA cover",
+  "name": "Protected Area coverage (World Bank)",
   "description": "Protected Area coverage (World Bank)",
   "theme": "Biodiversity",
   "type": "worldBank",
@@ -1257,7 +1257,7 @@
   },
   "indicatorDefinition": {
       "unit": "%",
-      "short_unit": "%",
+      "shortUnit": "%",
       "apiUrl": "http://localhost:3002/wb/ARE",
       "apiIndicatorName": "NY.ADJ.DCO2.GN.ZS",
       "period": "annual",
@@ -1290,8 +1290,8 @@
       ]
     }
 }, {
-  "short_name": "Cereals Production",
-  "title": "Cereals Production (UNEP EDE)",
+  "shortName": "Cereals Production",
+  "name": "Cereals Production (UNEP EDE)",
   "description": "Production of Cereals",
   "theme": "Environmental Awareness",
   "type": "ede",
@@ -1302,7 +1302,7 @@
   },
   "indicatorDefinition": {
       "unit": "Metric tons",
-      "short_unit": "T",
+      "shortUnit": "T",
       "apiUrl": "http://localhost:3002/ede/AE",
       "apiVariableId": "1",
       "period": "annual",
@@ -1334,8 +1334,8 @@
       ]
     }
 }, {
-  "short_name": "Seagrass area (Blue carbon)",
-  "title": "Seagrass area (Blue Carbon)",
+  "shortName": "Seagrass area (Blue carbon)",
+  "name": "Seagrass area (Blue Carbon)",
   "description": "Seagrass area (Blue carbon)",
   "theme": "Biodiversity",
   "type": "cartodb",
@@ -1350,7 +1350,7 @@
     "cartodb_tablename": "nrt_bc_seagrass_copy",
     "query": "SELECT SUM(area_ha) FROM nrt_bc_seagrass_copy",
     "unit": "ha",
-    "short_unit": "ha",
+    "shortUnit": "ha",
     "period": "annual",
     "xAxis": "year",
     "yAxis": "value",
diff --git a/server/config/instances/abu_dhabi_old/seeds/indicators.json b/server/config/instances/abu_dhabi_old/seeds/indicators.json
index acced3de..14a6287a 100644
--- a/server/config/instances/abu_dhabi_old/seeds/indicators.json
+++ b/server/config/instances/abu_dhabi_old/seeds/indicators.json
@@ -1,6 +1,6 @@
 [{
-  "short_name": "GHG Emission",
-  "title": "Total GHG emissions as % of year 2010 level of emissions",
+  "shortName": "GHG Emission",
+  "name": "Total GHG emissions as % of year 2010 level of emissions",
   "theme": "Air Quality",
   "sections": [
     {"title": "Description", "content": "Total GHG emissions as % of year 2010 level of emissions"}
@@ -9,8 +9,8 @@
   "indicatorDefinition": {
   }
 }, {
-  "short_name": "CO Concentration",
-  "title": "Average annual CO concentration in µg per m3",
+  "shortName": "CO Concentration",
+  "name": "Average annual CO concentration in µg per m3",
   "theme": "Air Quality",
   "sections": [
     {"title": "Description", "content": "Average annual CO concentration in µg per m3"}
@@ -27,7 +27,7 @@
       "serviceName": "NRT_AD_AirQuality",
       "featureServer": 1,
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -69,8 +69,8 @@
       ]
   }
 }, {
-  "short_name": "NO2 Concentration",
-  "title": "Average annual NO2 concentration in µg per m3",
+  "shortName": "NO2 Concentration",
+  "name": "Average annual NO2 concentration in µg per m3",
   "theme": "Air Quality",
   "sections": [
     {"title": "Description", "content": "Average annual NO2 concentration in µg per m3"}
@@ -87,7 +87,7 @@
       "serviceName": "NRT_AD_AirQuality",
       "featureServer": 2,
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -129,8 +129,8 @@
       ]
   }
 }, {
-  "short_name": "SO2 Concentration",
-  "title": "Hourly average SO2 concentration in µg per m3",
+  "shortName": "SO2 Concentration",
+  "name": "Hourly average SO2 concentration in µg per m3",
   "theme": "Air Quality",
   "sections": [
     {"title": "Description", "content": "Hourly average SO2 concentration in µg per m3"}
@@ -147,7 +147,7 @@
       "serviceName": "NRT_AD_AirQuality",
       "featureServer": 5,
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -189,8 +189,8 @@
       ]
   }
 },{
-  "short_name": "PM10 Concentration",
-  "title": "Daily average PM10 concentration in µg per m3",
+  "shortName": "PM10 Concentration",
+  "name": "Daily average PM10 concentration in µg per m3",
   "theme": "Air Quality",
   "sections": [
     {"title": "Description", "content": "Daily average PM10 concentration in µg per m3"}
@@ -207,7 +207,7 @@
       "serviceName": "NRT_AD_AirQuality",
       "featureServer": 4,
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -249,8 +249,8 @@
       ]
   }
 },{
-  "short_name": "PM25 Concentration",
-  "title": "Annual average PM25 concentration in µg per m3",
+  "shortName": "PM25 Concentration",
+  "name": "Annual average PM25 concentration in µg per m3",
   "theme": "Air Quality",
   "sections": [
     {"title": "Description", "content": "Annual average PM25 concentration in µg per m3"}
@@ -267,7 +267,7 @@
       "serviceName": "NRT_AD_AirQuality",
       "featureServer": -1,
       "unit": "µg per m3",
-      "short_unit": "µg/m3",
+      "shortUnit": "µg/m3",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -300,8 +300,8 @@
       ]
   }
 },{
-  "short_name": "O3 Concentration",
-  "title": "1-hr and 8-hr O3 concentration in µg per m3",
+  "shortName": "O3 Concentration",
+  "name": "1-hr and 8-hr O3 concentration in µg per m3",
   "theme": "Air Quality",
   "sections": [
     {"title": "Description", "content": "Daily average PM10 concentration in µg per m3"}
@@ -318,7 +318,7 @@
       "serviceName": "NRT_AD_AirQuality",
       "featureServer": 3,
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -360,9 +360,9 @@
       ]
   }
 },{
-  "short_name": "Protected areas",
-  "title": "Protected Area as a Percent of Total area",
-  
+  "shortName": "Protected areas",
+  "name": "Protected Area as a Percent of Total area",
+
   "theme": "Biodiversity",
   "sections": [
     {"title": "Description", "content": "This indicator measures the area of protected land ecosystems, inland water ecosystems, and marine ecosystems expressed as a percentage of the total area of land ecosystems, inland water ecosystems and marine ecosystems respectively.  Protected Area refers to all or partially protected areas of at least 1000 hectares that are designated as national parks, natural monuments, natural reserves or wildlife sanctuaries, protected landscapes and seascapes or scientific reserves with limited public access. The data do not include sites protected under local or provincial law."}
@@ -379,7 +379,7 @@
       "serviceName": "NRT_AD_ProtectedArea",
       "featureServer": 2,
       "unit": "%",
-      "short_unit": "%",
+      "shortUnit": "%",
       "period": "annual",
       "xAxis": "date",
       "yAxis": "value",
@@ -412,8 +412,8 @@
       ]
     }
 }, {
-  "short_name": "Area of Key Ecosystems",
-  "title": "Area of Selected Key Ecosystems as a Percent of Total Area",
+  "shortName": "Area of Key Ecosystems",
+  "name": "Area of Selected Key Ecosystems as a Percent of Total Area",
   "theme": "Biodiversity",
   "sections": [
     {"title": "Description", "content": "Area of Selected Key Ecosystems as a Percent of Total Area"}
@@ -429,8 +429,8 @@
   "indicatorDefinition": {
   }
 },{
-  "short_name": "Threatened species",
-  "title": "Percentage of Threatened Species",
+  "shortName": "Threatened species",
+  "name": "Percentage of Threatened Species",
   "description": "Number of species at risk of extinction in proportion to the total number of native species.",
   "theme": "Biodiversity",
   "indicatorDefinition": {
@@ -455,8 +455,8 @@
       ]
     }
 }, {
-  "short_name": "Abundance of Key Species",
-  "title": "Abundance of Selected Key Species",
+  "shortName": "Abundance of Key Species",
+  "name": "Abundance of Selected Key Species",
   "theme": "Biodiversity",
   "sections": [
     {"title": "Description", "content": "Abundance of Selected Key Species"}
@@ -472,8 +472,8 @@
   "indicatorDefinition": {
   }
 },{
-  "short_name": "Fish Resource Status",
-  "title": "Annual fish catch from sustainable fisheries",
+  "shortName": "Fish Resource Status",
+  "name": "Annual fish catch from sustainable fisheries",
   "theme": "Productive Natural Resources",
   "sections": [
     {"title": "Description", "content": "Annual fish catch from sustainable fisheries"}
@@ -489,8 +489,8 @@
   "indicatorDefinition": {
   }
 }, {
-  "short_name": "Ammonia",
-  "title": "Ammonia",
+  "shortName": "Ammonia",
+  "name": "Ammonia",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": ""}
@@ -507,7 +507,7 @@
       "serviceName": "NRT_AD_MarineWQ",
       "featureServer": 0,
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -549,8 +549,8 @@
       ]
   }
 }, {
-  "short_name": "Coastal Chlorophyll",
-  "title": "Coastal Chlorophyll",
+  "shortName": "Coastal Chlorophyll",
+  "name": "Coastal Chlorophyll",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": ""}
@@ -567,7 +567,7 @@
       "serviceName": "NRT_AD_MarineWQ",
       "featureServer": 1,
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -609,8 +609,8 @@
       ]
   }
 }, {
-  "short_name": "Dissolved Oxygen",
-  "title": "Dissolved Oxygen",
+  "shortName": "Dissolved Oxygen",
+  "name": "Dissolved Oxygen",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": ""}
@@ -627,7 +627,7 @@
       "serviceName": "NRT_AD_MarineWQ",
       "featureServer": 2,
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -669,8 +669,8 @@
       ]
   }
 }, {
-  "short_name": "Nitrate-N Concentrations",
-  "title": "Nitrate –N concentration in coastal waters (µg per L)",
+  "shortName": "Nitrate-N Concentrations",
+  "name": "Nitrate –N concentration in coastal waters (µg per L)",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": "Area of Selected Key Ecosystems as a Percent of Total Area"}
@@ -687,7 +687,7 @@
       "serviceName": "NRT_AD_MarineWQ",
       "featureServer": 4,
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -729,8 +729,8 @@
       ]
   }
 }, {
-  "short_name": "Phosphate P",
-  "title": "Phosphate P",
+  "shortName": "Phosphate P",
+  "name": "Phosphate P",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": ""}
@@ -747,7 +747,7 @@
       "serviceName": "NRT_AD_MarineWQ",
       "featureServer": 5,
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -789,8 +789,8 @@
       ]
   }
 }, {
-  "short_name": "Enterococci Concentrations",
-  "title": "Enterococci concentration in 100 ml of coastal waters",
+  "shortName": "Enterococci Concentrations",
+  "name": "Enterococci concentration in 100 ml of coastal waters",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": "Enterococci concentration in 100 ml of coastal waters"}
@@ -807,7 +807,7 @@
       "serviceName": "NRT_AD_MarineWQ",
       "featureServer": 3,
       "unit": "stations",
-      "short_unit": "stations",
+      "shortUnit": "stations",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -849,8 +849,8 @@
       ]
   }
 }, {
-  "short_name": "Groundwater Reserves",
-  "title": "Effective years remaining in usable groundwater reserves",
+  "shortName": "Groundwater Reserves",
+  "name": "Effective years remaining in usable groundwater reserves",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": "Effective years remaining in usable groundwater reserves"}
@@ -866,8 +866,8 @@
   "indicatorDefinition": {
   }
 }, {
-  "short_name": "Salinity",
-  "title": "Area (km2) of aquifer where water quality is <= 1500 ppm TDS concentration",
+  "shortName": "Salinity",
+  "name": "Area (km2) of aquifer where water quality is <= 1500 ppm TDS concentration",
   "theme": "Water",
   "sections": [
     {"title": "Description", "content": "Area (km2) of aquifer where water quality is less than or equal to 1500 ppm TDS concentration"}
@@ -883,8 +883,8 @@
   "indicatorDefinition": {
   }
 },{
-  "short_name": "Awareness of Water",
-  "title": "Awareness on ground water depletion and high domestic water consumption",
+  "shortName": "Awareness of Water",
+  "name": "Awareness on ground water depletion and high domestic water consumption",
   "theme": "Environmental Awareness",
   "sections": [
     {"title": "Description", "content": "Awareness on ground water depletion and high domestic water consumption"}
@@ -900,8 +900,8 @@
   "indicatorDefinition": {
   }
 },{
-  "short_name": "Awareness of Fish Stocks",
-  "title": "Awareness on diminishing fish stock",
+  "shortName": "Awareness of Fish Stocks",
+  "name": "Awareness on diminishing fish stock",
   "theme": "Environmental Awareness",
   "sections": [
     {"title": "Description", "content": "Awareness on diminishing fish stock"}
@@ -917,8 +917,8 @@
   "indicatorDefinition": {
   }
 },{
-  "short_name": "Awareness of air quality",
-  "title": "Awareness on air quality (indoor and outdoor) & noise pollution",
+  "shortName": "Awareness of air quality",
+  "name": "Awareness on air quality (indoor and outdoor) & noise pollution",
   "theme": "Environmental Awareness",
   "sections": [
     {"title": "Description", "content": "Awareness on air quality (indoor and outdoor) & noise pollution"}
@@ -934,8 +934,8 @@
   "indicatorDefinition": {
   }
 },{
-  "short_name": "Awareness of biodiversity",
-  "title": "Awareness on Biodiversity (marine and terrestrial",
+  "shortName": "Awareness of biodiversity",
+  "name": "Awareness on Biodiversity (marine and terrestrial",
   "theme": "Environmental Awareness",
   "sections": [
     {"title": "Description", "content": "Awareness on Biodiversity (marine and terrestrial"}
@@ -954,14 +954,14 @@
 
 
 {
-  "short_name": "Urban air pollution",
-  "title": "Ambient Concentration of Air Pollutants in Urban Areas",
+  "shortName": "Urban air pollution",
+  "name": "Ambient Concentration of Air Pollutants in Urban Areas",
   "description": "Ambient air pollution concentrations of ozone, particulate matter (PM10, and PM2,5, if those are not available: SPM, black smoke), sulfur dioxide, nitrogen dioxide, lead. Additional:  carbon monoxide, volatile organic compounds including benzene (VOCs). The priority is collection of the indicator in large cities (over 1 million population).",
   "theme": "Air Quality",
   "indicatorDefinition": {
       "sourceUrl": "/MapThemes/TerrestrialHabitat/MapServer/14",
       "operation": "sum",
-      "short_unit": "µg/m3",
+      "shortUnit": "µg/m3",
       "unit": "µg/m3, ppm or ppb, as appropriate",
       "outFields": "shape.area",
       "dateField": "datedes",
@@ -981,14 +981,14 @@
       ]
     }
 }, {
-  "short_name": "Red List species",
-  "title": "Abu Dhabi Red List Indices For All Species Groups",
+  "shortName": "Red List species",
+  "name": "Abu Dhabi Red List Indices For All Species Groups",
   "description": "",
   "theme": "Biodiversity",
   "indicatorDefinition": {
       "sourceUrl": "/MapThemes/TerrestrialHabitat/MapServer/14",
       "operation": "sum",
-      "short_unit": "",
+      "shortUnit": "",
       "unit": "",
       "outFields": "shape.area",
       "dateField": "datedes",
@@ -1008,14 +1008,14 @@
       ]
     }
 }, {
-  "short_name": "Annual Fish Catch",
-  "title": "Abu Dhabi Red List Indices For All Species Groups",
+  "shortName": "Annual Fish Catch",
+  "name": "Abu Dhabi Red List Indices For All Species Groups",
   "description": "Annual catch of major species in relation to spawning biomass if available or in relation to the year of maximum catches in the time series.",
   "theme": "Productive Natural Resources",
   "indicatorDefinition": {
       "sourceUrl": "/MapThemes/TerrestrialHabitat/MapServer/14",
       "operation": "sum",
-      "short_unit": "t",
+      "shortUnit": "t",
       "unit": "metric tons",
       "outFields": "shape.area",
       "dateField": "datedes",
@@ -1035,14 +1035,14 @@
       ]
     }
 }, {
-  "short_name": "World Bank PA cover",
-  "title": "Protected Area coverage (World Bank)",
+  "shortName": "World Bank PA cover",
+  "name": "Protected Area coverage (World Bank)",
   "description": "Protected Area coverage (World Bank)",
   "theme": "Biodiversity",
   "type": "worldBank",
   "indicatorDefinition": {
       "unit": "%",
-      "short_unit": "%",
+      "shortUnit": "%",
       "apiUrl": "http://localhost:3002/wb/ARE",
       "apiIndicatorName": "NY.ADJ.DCO2.GN.ZS",
       "period": "annual",
@@ -1075,14 +1075,14 @@
       ]
     }
 }, {
-  "short_name": "Cereals Production",
-  "title": "Cereals Production (UNEP EDE)",
+  "shortName": "Cereals Production",
+  "name": "Cereals Production (UNEP EDE)",
   "description": "Production of Cereals",
   "theme": "Environmental Awareness",
   "type": "ede",
   "indicatorDefinition": {
       "unit": "Metric tons",
-      "short_unit": "T",
+      "shortUnit": "T",
       "apiUrl": "http://localhost:3002/ede/AE",
       "apiVariableId": "1",
       "period": "annual",
@@ -1114,8 +1114,8 @@
       ]
     }
 }, {
-  "short_name": "Seagrass area (Blue carbon)",
-  "title": "Seagrass area (Blue Carbon)",
+  "shortName": "Seagrass area (Blue carbon)",
+  "name": "Seagrass area (Blue Carbon)",
   "description": "Seagrass area (Blue carbon)",
   "theme": "Biodiversity",
   "type": "cartodb",
@@ -1125,7 +1125,7 @@
     "cartodb_tablename": "nrt_bc_seagrass_copy",
     "query": "SELECT SUM(area_ha) FROM nrt_bc_seagrass_copy",
     "unit": "ha",
-    "short_unit": "ha",
+    "shortUnit": "ha",
     "period": "annual",
     "xAxis": "year",
     "yAxis": "value",
diff --git a/server/config/instances/kenya/seeds/indicators.json b/server/config/instances/kenya/seeds/indicators.json
index 79b36d45..256fee64 100644
--- a/server/config/instances/kenya/seeds/indicators.json
+++ b/server/config/instances/kenya/seeds/indicators.json
@@ -1,6 +1,6 @@
 [{
-  "short_name": "Contribution to agriculture section",
-  "title": "Forestry sector contribution to the agriculture section",
+  "shortName": "Contribution to agriculture section",
+  "name": "Forestry sector contribution to the agriculture section",
   "theme": "Contribution of the forestry sector",
   "sections": [],
   "indicatorationConfig": {
@@ -10,16 +10,16 @@
       "table_name": "kenya_20indicator_20data_20feed"
     },
     "range": [
-        {"minValue": 0.35, "message": "Excellent"},
-        {"minValue": 0.15, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.35, "text": "Excellent"},
+        {"threshold": 0.15, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
   "type": "standard",
   "primary": true,
   "indicatorDefinition": {
     "unit": "% contribution",
-    "short_unit": "%",
+    "shortUnit": "%",
     "period": "annual",
     "xAxis": "date",
     "yAxis": "value",
@@ -50,7 +50,7 @@
     ]
   }
 }, {
-    "short_name": "Contribution other primary industries",
+    "shortName": "Contribution other primary industries",
     "title": "Forestry sector contribution to other primary industries",
     "theme": "Contribution of the forestry sector",
     "sections": [],
@@ -61,16 +61,16 @@
         "table_name": "kenya_20indicator_20data_20feed"
       },
       "range": [
-          {"minValue": 0.35, "message": "Excellent"},
-          {"minValue": 0.15, "message": "Good"},
-          {"minValue": 0, "message": "Bad"}
+          {"threshold": 0.35, "text": "Excellent"},
+          {"threshold": 0.15, "text": "Good"},
+          {"threshold": 0, "text": "Bad"}
       ]
     },
     "type": "standard",
     "primary": true,
     "indicatorDefinition": {
       "unit": "% contribution",
-      "short_unit": "%",
+      "shortUnit": "%",
       "period": "annual",
       "xAxis": "date",
       "yAxis": "value",
@@ -101,24 +101,24 @@
       ]
     }
   }, {
-    "short_name": "Manufacture of food, beverages and tobacco",
+    "shortName": "Manufacture of food, beverages and tobacco",
     "title": "Manufacture of food, beverages and tobacco",
     "theme": "Contribution of the forestry sector",
     "sections": [],
     "indicatorationConfig": {
-      "spreadsheet_key": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
+      "spreadsheetKey": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
       "source": "gdoc",
       "range": [
-          {"minValue": 0.35, "message": "Excellent"},
-          {"minValue": 0.15, "message": "Good"},
-          {"minValue": 0, "message": "Bad"}
+          {"threshold": 0.35, "text": "Excellent"},
+          {"threshold": 0.15, "text": "Good"},
+          {"threshold": 0, "text": "Bad"}
       ]
     },
     "type": "standard",
     "primary": true,
     "indicatorDefinition": {
       "unit": "% contribution",
-      "short_unit": "%",
+      "shortUnit": "%",
       "period": "annual",
       "xAxis": "date",
       "yAxis": "value",
@@ -149,23 +149,23 @@
       ]
     }
   }, {
-    "short_name": "Contribution to wood and paper sector",
+    "shortName": "Contribution to wood and paper sector",
     "title": "Forestry sector contribution to the wood and paper sector",
     "theme": "Contribution of the forestry sector",
     "type": "standard",
     "primary": true,
     "indicatorationConfig": {
-      "spreadsheet_key": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
+      "spreadsheetKey": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
       "source": "gdoc",
       "range": [
-          {"minValue": 0.35, "message": "Excellent"},
-          {"minValue": 0.15, "message": "Good"},
-          {"minValue": 0, "message": "Bad"}
+          {"threshold": 0.35, "text": "Excellent"},
+          {"threshold": 0.15, "text": "Good"},
+          {"threshold": 0, "text": "Bad"}
       ]
     },
     "indicatorDefinition": {
       "unit": "% contribution",
-      "short_unit": "%",
+      "shortUnit": "%",
       "period": "annual",
       "xAxis": "date",
       "yAxis": "value",
@@ -196,23 +196,23 @@
       ]
     }
   }, {
-    "short_name": "Contribution to chemical industry sector",
+    "shortName": "Contribution to chemical industry sector",
     "title": "Forestry sector contribution to the chemical industry sector",
     "theme": "Contribution of the forestry sector",
     "type": "standard",
     "primary": true,
     "indicatorationConfig": {
-      "spreadsheet_key": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
+      "spreadsheetKey": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
       "source": "gdoc",
       "range": [
-          {"minValue": 0.35, "message": "Excellent"},
-          {"minValue": 0.15, "message": "Good"},
-          {"minValue": 0, "message": "Bad"}
+          {"threshold": 0.35, "text": "Excellent"},
+          {"threshold": 0.15, "text": "Good"},
+          {"threshold": 0, "text": "Bad"}
       ]
     },
     "indicatorDefinition": {
       "unit": "% contribution",
-      "short_unit": "%",
+      "shortUnit": "%",
       "period": "annual",
       "xAxis": "date",
       "yAxis": "value",
@@ -243,23 +243,23 @@
       ]
     }
   }, {
-    "short_name": "Contribution to other manufacturing sector",
+    "shortName": "Contribution to other manufacturing sector",
     "title": "Forestry sector contribution to other manufacturing sector",
     "theme": "Contribution of the forestry sector",
     "type": "standard",
     "primary": true,
     "indicatorationConfig": {
-      "spreadsheet_key": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
+      "spreadsheetKey": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
       "source": "gdoc",
       "range": [
-          {"minValue": 0.35, "message": "Excellent"},
-          {"minValue": 0.15, "message": "Good"},
-          {"minValue": 0, "message": "Bad"}
+          {"threshold": 0.35, "text": "Excellent"},
+          {"threshold": 0.15, "text": "Good"},
+          {"threshold": 0, "text": "Bad"}
       ]
     },
     "indicatorDefinition": {
       "unit": "% contribution",
-      "short_unit": "%",
+      "shortUnit": "%",
       "period": "annual",
       "xAxis": "date",
       "yAxis": "value",
@@ -290,23 +290,23 @@
       ]
     }
   }, {
-    "short_name": "Contribution to construction sector",
+    "shortName": "Contribution to construction sector",
     "title": "Forestry sector contribution to the construction sector",
     "theme": "Contribution of the forestry sector",
     "type": "standard",
     "primary": true,
     "indicatorationConfig": {
-      "spreadsheet_key": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
+      "spreadsheetKey": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
       "source": "gdoc",
       "range": [
-          {"minValue": 0.35, "message": "Excellent"},
-          {"minValue": 0.15, "message": "Good"},
-          {"minValue": 0, "message": "Bad"}
+          {"threshold": 0.35, "text": "Excellent"},
+          {"threshold": 0.15, "text": "Good"},
+          {"threshold": 0, "text": "Bad"}
       ]
     },
     "indicatorDefinition": {
       "unit": "% contribution",
-      "short_unit": "%",
+      "shortUnit": "%",
       "period": "annual",
       "xAxis": "date",
       "yAxis": "value",
@@ -337,23 +337,23 @@
       ]
     }
   }, {
-    "short_name": "Contribution to wholesale and retail trade sector",
+    "shortName": "Contribution to wholesale and retail trade sector",
     "title": "Forestry sector contribution to wholesale and retail trade sector",
     "theme": "Contribution of the forestry sector",
     "type": "standard",
     "primary": true,
     "indicatorationConfig": {
-      "spreadsheet_key": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
+      "spreadsheetKey": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
       "source": "gdoc",
       "range": [
-          {"minValue": 0.35, "message": "Excellent"},
-          {"minValue": 0.15, "message": "Good"},
-          {"minValue": 0, "message": "Bad"}
+          {"threshold": 0.35, "text": "Excellent"},
+          {"threshold": 0.15, "text": "Good"},
+          {"threshold": 0, "text": "Bad"}
       ]
     },
     "indicatorDefinition": {
       "unit": "% contribution",
-      "short_unit": "%",
+      "shortUnit": "%",
       "period": "annual",
       "xAxis": "date",
       "yAxis": "value",
@@ -384,23 +384,23 @@
       ]
     }
   }, {
-    "short_name": "Contribution to hotels and transport sector",
+    "shortName": "Contribution to hotels and transport sector",
     "title": "Forestry sector contribution to the hotels and transport sector",
     "theme": "Contribution of the forestry sector",
     "type": "standard",
     "primary": true,
     "indicatorationConfig": {
-      "spreadsheet_key": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
+      "spreadsheetKey": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
       "source": "gdoc",
       "range": [
-          {"minValue": 0.35, "message": "Excellent"},
-          {"minValue": 0.15, "message": "Good"},
-          {"minValue": 0, "message": "Bad"}
+          {"threshold": 0.35, "text": "Excellent"},
+          {"threshold": 0.15, "text": "Good"},
+          {"threshold": 0, "text": "Bad"}
       ]
     },
     "indicatorDefinition": {
       "unit": "% contribution",
-      "short_unit": "%",
+      "shortUnit": "%",
       "period": "annual",
       "xAxis": "date",
       "yAxis": "value",
@@ -431,23 +431,23 @@
       ]
     }
   }, {
-    "short_name": "Contribution to other services sector",
+    "shortName": "Contribution to other services sector",
     "title": "Forestry sector contribution to the other services sector",
     "theme": "Contribution of the forestry sector",
     "type": "standard",
     "primary": true,
     "indicatorationConfig": {
-      "spreadsheet_key": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
+      "spreadsheetKey": "0Aum3hJfH1Ze0dGtybGNCeUdTNFk1YWozUlJ1Vm5SQlE",
       "source": "gdoc",
       "range": [
-          {"minValue": 0.35, "message": "Excellent"},
-          {"minValue": 0.15, "message": "Good"},
-          {"minValue": 0, "message": "Bad"}
+          {"threshold": 0.35, "text": "Excellent"},
+          {"threshold": 0.15, "text": "Good"},
+          {"threshold": 0, "text": "Bad"}
       ]
     },
     "indicatorDefinition": {
       "unit": "% contribution",
-      "short_unit": "%",
+      "shortUnit": "%",
       "period": "annual",
       "xAxis": "date",
       "yAxis": "value",
diff --git a/server/config/instances/nrt/seeds/indicators.json b/server/config/instances/nrt/seeds/indicators.json
index 5b676a08..c2985513 100644
--- a/server/config/instances/nrt/seeds/indicators.json
+++ b/server/config/instances/nrt/seeds/indicators.json
@@ -1,21 +1,21 @@
 [{
-  "short_name": "Key stakeholders identified",
-  "title": "Key stakeholders identified",
+  "shortName": "Key stakeholders identified",
+  "name": "Key stakeholders identified",
   "theme": "Application",
   "sections": [],
   "primary": true,
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
+    "spreadsheetKey": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
   "indicatorDefinition": {
     "name": "Key stakeholders identified",
     "unit": "% of countries with named key stakeholders",
-    "short_unit": "%",
+    "shortUnit": "%",
     "period": "quarterly",
     "xAxis": "date",
     "yAxis": "value",
@@ -46,8 +46,8 @@
     ]
   }
 }, {
-  "title":"Key stakeholders on-board",
-  "short_name":"Key stakeholders on-board",
+  "name":"Key stakeholders on-board",
+  "shortName":"Key stakeholders on-board",
   "theme":"Stakeholders",
   "primary": true,
   "sections": [
@@ -56,18 +56,18 @@
   "indicatorationConfig": {
     "source": "gdoc",
     "name": "Key stakeholders on-board",
-    "spreadsheet_key": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
+    "spreadsheetKey": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
   "indicatorDefinition": {
     "unit":"% of countries with written endorsement for project",
-    "short_unit":"%",
+    "shortUnit":"%",
     "name": "Key stakeholders identified",
     "unit": "% of countries with named key stakeholders",
-    "short_unit": "%",
+    "shortUnit": "%",
     "period": "quarterly",
     "xAxis": "date",
     "yAxis": "value",
@@ -98,23 +98,23 @@
     ]
   }
 }, {
-  "short_name": "Indicator objectives identified",
-  "title": "Indicator objectives identified",
+  "shortName": "Indicator objectives identified",
+  "name": "Indicator objectives identified",
   "theme": "Data and indicators",
   "sections": [],
   "primary": true,
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
+    "spreadsheetKey": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
   "indicatorDefinition": {
     "name": "Indicator objectives identified",
     "unit": "% of countries with completed indicator objectives",
-    "short_unit": "%",
+    "shortUnit": "%",
     "period": "quarterly",
     "xAxis": "date",
     "yAxis": "value",
@@ -154,8 +154,8 @@
     ]
   }
 }, {
-  "title":"Indicators described and documented",
-  "short_name":"Indicators described and documented",
+  "name":"Indicators described and documented",
+  "shortName":"Indicators described and documented",
   "theme":"Data and indicators",
   "primary": true,
   "sections": [
@@ -163,15 +163,15 @@
   ],
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
+    "spreadsheetKey": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
   "indicatorDefinition": {
     "unit":"% of countries with completed indicator descriptions",
-    "short_unit":"%",
+    "shortUnit":"%",
     "period": "quarterly",
     "xAxis": "date",
     "yAxis": "value",
@@ -211,8 +211,8 @@
     ]
   }
 }, {
-  "title":"Raw data collected and flowing",
-  "short_name":"Raw data collected and flowing",
+  "name":"Raw data collected and flowing",
+  "shortName":"Raw data collected and flowing",
   "theme":"Data and indicators",
   "primary": true,
   "sections": [
@@ -220,15 +220,15 @@
   ],
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
+    "spreadsheetKey": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
     "indicatorDefinition": {
       "unit":"% of indicators for all countries with raw data flowing",
-      "short_unit":"%",
+      "shortUnit":"%",
       "period": "quarterly",
       "xAxis": "date",
       "yAxis": "value",
@@ -268,8 +268,8 @@
       ]
     }
 }, {
-  "title":"Indicators data feeds",
-  "short_name":"Indicators data feeds",
+  "name":"Indicators data feeds",
+  "shortName":"Indicators data feeds",
   "theme":"Data and indicators",
   "primary": true,
   "sections": [
@@ -277,15 +277,15 @@
   ],
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
+    "spreadsheetKey": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
   "indicatorDefinition": {
     "unit":"% of indicators for all countries with live indicators feeds",
-    "short_unit":"%",
+    "shortUnit":"%",
     "period": "quarterly",
     "xAxis": "date",
     "yAxis": "value",
@@ -325,8 +325,8 @@
     ]
   }
 }, {
-  "title":"Source code available and accessible",
-  "short_name":"Source code available and accessible",
+  "name":"Source code available and accessible",
+  "shortName":"Source code available and accessible",
   "theme":"Infrastructure",
   "primary": true,
   "sections": [
@@ -334,15 +334,15 @@
   ],
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
+    "spreadsheetKey": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
   "indicatorDefinition": {
     "unit":"code available = 1",
-    "short_unit":"YES/NO",
+    "shortUnit":"YES/NO",
     "period": "quarterly",
     "xAxis": "date",
     "yAxis": "value",
@@ -373,8 +373,8 @@
     ]
   }
 }, {
-  "title":"SaaS system deployed",
-  "short_name":"SaaS system deployed",
+  "name":"SaaS system deployed",
+  "shortName":"SaaS system deployed",
   "theme":"Infrastructure",
   "primary": true,
   "sections": [
@@ -382,15 +382,15 @@
   ],
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
+    "spreadsheetKey": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
   "indicatorDefinition": {
     "unit":"% progress on development of SaaS",
-    "short_unit":"%",
+    "shortUnit":"%",
     "period": "quarterly",
     "xAxis": "date",
     "yAxis": "value",
@@ -421,8 +421,8 @@
     ]
   }
 }, {
-  "title":"SaaS system is used",
-  "short_name":"SaaS system is used",
+  "name":"SaaS system is used",
+  "shortName":"SaaS system is used",
   "theme":"Infrastructure",
   "primary": true,
   "sections": [
@@ -430,15 +430,15 @@
   ],
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
+    "spreadsheetKey": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
   "indicatorDefinition": {
     "unit":"# of live instances",
-    "short_unit":"instances",
+    "shortUnit":"instances",
     "period": "quarterly",
     "xAxis": "date",
     "yAxis": "value",
@@ -469,8 +469,8 @@
     ]
   }
 }, {
-  "title":"NRT network instances are up to date",
-  "short_name":"NRT network instances are up to date",
+  "name":"NRT network instances are up to date",
+  "shortName":"NRT network instances are up to date",
   "theme":"Infrastructure",
   "primary": true,
   "sections": [
@@ -478,15 +478,15 @@
   ],
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
+    "spreadsheetKey": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
   "indicatorDefinition": {
     "unit":"% of instances running latest release",
-    "short_unit":"%",
+    "shortUnit":"%",
     "period": "quarterly",
     "xAxis": "date",
     "yAxis": "value",
@@ -517,8 +517,8 @@
     ]
   }
 }, {
-  "title":"Reporting GUI complete",
-  "short_name":"Reporting GUI complete",
+  "name":"Reporting GUI complete",
+  "shortName":"Reporting GUI complete",
   "theme":"Application",
   "primary": true,
   "sections": [
@@ -526,15 +526,15 @@
   ],
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
+    "spreadsheetKey": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
   "indicatorDefinition": {
     "unit":"% progress on development",
-    "short_unit":"%",
+    "shortUnit":"%",
     "period": "quarterly",
     "xAxis": "date",
     "yAxis": "value",
@@ -565,8 +565,8 @@
     ]
   }
 }, {
-  "title":"Indicator management GUI complete",
-  "short_name":"Indicator management GUI complete",
+  "name":"Indicator management GUI complete",
+  "shortName":"Indicator management GUI complete",
   "theme":"Application",
   "primary": true,
   "sections": [
@@ -574,15 +574,15 @@
   ],
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
+    "spreadsheetKey": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
   "indicatorDefinition": {
     "unit":"% progress on development",
-    "short_unit":"%",
+    "shortUnit":"%",
     "period": "quarterly",
     "xAxis": "date",
     "yAxis": "value",
@@ -613,8 +613,8 @@
     ]
   }
 }, {
-  "title":"Admin GUI complete",
-  "short_name":"Admin GUI complete",
+  "name":"Admin GUI complete",
+  "shortName":"Admin GUI complete",
   "theme":"Application",
   "primary": true,
   "sections": [
@@ -622,15 +622,15 @@
   ],
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
+    "spreadsheetKey": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
   "indicatorDefinition": {
     "unit":"% progress on development",
-    "short_unit":"%",
+    "shortUnit":"%",
     "period": "quarterly",
     "xAxis": "date",
     "yAxis": "value",
@@ -661,8 +661,8 @@
     ]
   }
 }, {
-  "title":"Local NRTs exposing data to UNEP-Live",
-  "short_name":"Local NRTs exposing data to UNEP-Live",
+  "name":"Local NRTs exposing data to UNEP-Live",
+  "shortName":"Local NRTs exposing data to UNEP-Live",
   "theme":"Sharing data",
   "primary": true,
   "sections": [
@@ -670,15 +670,15 @@
   ],
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
+    "spreadsheetKey": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
   "indicatorDefinition": {
     "unit":"# of feeds/country",
-    "short_unit":"feeds/country",
+    "shortUnit":"feeds/country",
     "period": "quarterly",
     "xAxis": "date",
     "yAxis": "value",
@@ -718,8 +718,8 @@
     ]
   }
 }, {
-  "title":"Local NRTs consuming data",
-  "short_name":"Local NRTs consuming data",
+  "name":"Local NRTs consuming data",
+  "shortName":"Local NRTs consuming data",
   "theme":"Sharing data",
   "primary": true,
   "sections": [
@@ -727,15 +727,15 @@
   ],
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
+    "spreadsheetKey": "0AlwvbwkzsybqdHo3dnltR2owbFdTS29ZUHUydEIzZkE",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ]
   },
   "indicatorDefinition": {
     "unit":"# of feeds/country",
-    "short_unit":"feeds/country",
+    "shortUnit":"feeds/country",
     "period": "quarterly",
     "xAxis": "date",
     "yAxis": "value",
diff --git a/server/config/instances/st_lucia/seeds/indicators.json b/server/config/instances/st_lucia/seeds/indicators.json
index f765fad1..f198ad35 100644
--- a/server/config/instances/st_lucia/seeds/indicators.json
+++ b/server/config/instances/st_lucia/seeds/indicators.json
@@ -1,15 +1,15 @@
 [{
-  "short_name": "Fish Landings",
-  "title": "Fish Landings",
+  "shortName": "Fish Landings",
+  "name": "Fish Landings",
   "theme": "Coastal and Marine resources",
   "sections": [],
   "primary": true,
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "1IsJzMWxbj0ljOnpA9tszIaajZtoCrsGm1eEwT_riDfc",
+    "spreadsheetKey": "1IsJzMWxbj0ljOnpA9tszIaajZtoCrsGm1eEwT_riDfc",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ],
     "sorting": {
       "field": "year",
@@ -17,9 +17,8 @@
     }
   },
   "indicatorDefinition": {
-    "name": "Fish Landings",
     "unit": "landings",
-    "short_unit": "landings",
+    "shortUnit": "landings",
     "period": "yearly",
     "xAxis": "year",
     "yAxis": "value",
@@ -50,17 +49,17 @@
     ]
   }
 }, {
-  "short_name": "% of households using gas or electricity for cooking",
-  "title": "% of households using gas or electricity for cooking",
+  "shortName": "% of households using gas or electricity for cooking",
+  "name": "% of households using gas or electricity for cooking",
   "theme": "Energy and Minerals",
   "sections": [],
   "primary": true,
   "indicatorationConfig": {
     "source": "gdoc",
-    "spreadsheet_key": "10Ulqfl6W8DtMV1USAYHOifLiGrozRZ7JzBJx4lN1alY",
+    "spreadsheetKey": "10Ulqfl6W8DtMV1USAYHOifLiGrozRZ7JzBJx4lN1alY",
     "range": [
-        {"minValue": 0.5, "message": "Good"},
-        {"minValue": 0, "message": "Bad"}
+        {"threshold": 0.5, "text": "Good"},
+        {"threshold": 0, "text": "Bad"}
     ],
     "sorting": {
       "field": "year",
@@ -68,9 +67,8 @@
     }
   },
   "indicatorDefinition": {
-    "name": "% of households using gas or electricity for cooking",
     "unit": "percentage",
-    "short_unit": "percentage",
+    "shortUnit": "percentage",
     "period": "yearly",
     "xAxis": "year",
     "yAxis": "value",
@@ -101,8 +99,8 @@
     ]
   }
 }, {
-  "short_name": "CO2 emissions (metric tons per capita)",
-  "title": "CO2 emissions (metric tons per capita)",
+  "shortName": "CO2 emissions (metric tons per capita)",
+  "name": "CO2 emissions (metric tons per capita)",
   "theme": "Air",
   "sections": [],
   "primary": true,
@@ -113,8 +111,8 @@
       "countryCode": "LC"
     },
     "range": [
-      {"minValue": 0, "message": "Good"},
-      {"minValue": 20, "message": "Bad"}
+      {"threshold": 0, "text": "Good"},
+      {"threshold": 20, "text": "Bad"}
     ],
     "sorting": {
       "field": "year",
@@ -123,7 +121,7 @@
   },
   "indicatorDefinition": {
     "unit": "metric tons",
-    "short_unit": "t",
+    "shortUnit": "t",
     "period": "annual",
     "xAxis": "year",
     "yAxis": "value",
@@ -154,8 +152,8 @@
     ]
   }
 }, {
-  "short_name": "Terrestrial protected areas (% of total land area)",
-  "title": "Terrestrial protected areas (% of total land area)",
+  "shortName": "Terrestrial protected areas (% of total land area)",
+  "name": "Terrestrial protected areas (% of total land area)",
   "theme": "Biodiversity",
   "sections": [],
   "primary": true,
@@ -166,8 +164,8 @@
       "countryCode": "LC"
     },
     "range": [
-      {"minValue": 50, "message": "Good"},
-      {"minValue": 0, "message": "Bad"}
+      {"threshold": 50, "text": "Good"},
+      {"threshold": 0, "text": "Bad"}
     ],
     "sorting": {
       "field": "year",
@@ -176,7 +174,7 @@
   },
   "indicatorDefinition": {
     "unit": "percentage",
-    "short_unit": "%",
+    "shortUnit": "%",
     "period": "annual",
     "xAxis": "year",
     "yAxis": "value",
@@ -207,8 +205,8 @@
     ]
   }
 }, {
-  "short_name": "Fish species, threatened",
-  "title": "Fish species, threatened",
+  "shortName": "Fish species, threatened",
+  "name": "Fish species, threatened",
   "theme": "Biodiversity",
   "sections": [],
   "primary": true,
@@ -219,8 +217,8 @@
       "countryCode": "LC"
     },
     "range": [
-      {"minValue": 0, "message": "Good"},
-      {"minValue": 20, "message": "Bad"}
+      {"threshold": 0, "text": "Good"},
+      {"threshold": 20, "text": "Bad"}
     ],
     "sorting": {
       "field": "year",
@@ -229,7 +227,7 @@
   },
   "indicatorDefinition": {
     "unit": "threatened species",
-    "short_unit": "species",
+    "shortUnit": "species",
     "period": "annual",
     "xAxis": "year",
     "yAxis": "value",
diff --git a/server/controllers/api/indicator.coffee b/server/controllers/api/indicator.coffee
index 3c848d33..75fadcc8 100644
--- a/server/controllers/api/indicator.coffee
+++ b/server/controllers/api/indicator.coffee
@@ -114,7 +114,7 @@ exports.dataAsCSV = (req, res) ->
 
             res.set('Content-Type', 'application/zip')
             res.set('Content-Disposition',
-              "attachment; filename=NRT #{indicator.short_name} Data.zip"
+              "attachment; filename=NRT #{indicator.shortName} Data.zip"
             )
 
             res.end(data, 'binary')
diff --git a/server/docs/indicator_definitions.md b/server/docs/indicator_definitions.md
index 00dbdb9c..fdda1862 100644
--- a/server/docs/indicator_definitions.md
+++ b/server/docs/indicator_definitions.md
@@ -1,11 +1,11 @@
 # Defining indicators
 The indicators the application is seeded with are defined inside
 config/seeds/indicators.json. This document describes the fields indicators are
-expected to have, and how they affect the behavior of the application 
+expected to have, and how they affect the behavior of the application
 
 ## Fields
 
-* **short_name** - The short title of the indicator.
+* **shortName** - The short title of the indicator.
 * **title** - Full title of the indicator
 * **sections** - A array of sections to seed the page with. Each section should consist of a title and content attribute.
 * **theme** - The title of the theme that the indicators refers to. This is turned into a proper ID association when seeded.
@@ -32,7 +32,7 @@ These attributes are used to build the query that gets sent to the indicatorator
 These fields tell the application how to interpret the indicator data.
 
 * **unit**: The full name of the unit of the yAxis
-* **short_unit**: The short name of above
+* **shortUnit**: The short name of above
 * **period**: The frequency at which the indicator is calculated, e.g. 'annual'
 * **xAxis**: The name of the field which acts as the xAxis. This is typically a temporal field
 * **yAxis**: The name of the field which acts as the yAxis. This is typically an amount, e.g. number of exceedances.
diff --git a/server/lib/gdoc_indicator_importer.coffee b/server/lib/gdoc_indicator_importer.coffee
index 620e7c69..2277553d 100644
--- a/server/lib/gdoc_indicator_importer.coffee
+++ b/server/lib/gdoc_indicator_importer.coffee
@@ -47,8 +47,8 @@ extractRangesFromWorksheet = (worksheet) ->
   ranges = []
   while (range = worksheet[index.toString()])?
     ranges.push(
-      minValue: parseFloat(range['1'].value, 10)
-      message: range['2'].value
+      threshold: parseFloat(range['1'].value, 10)
+      text: range['2'].value
     )
     index = index + 1
 
@@ -59,7 +59,7 @@ module.exports = class GDocIndicatorImporter
     @indicatorProperties = {
       indicatorationConfig:
         source: 'gdoc'
-        spreadsheet_key: key
+        spreadsheetKey: key
     }
 
   @import: (key) ->
@@ -83,12 +83,12 @@ module.exports = class GDocIndicatorImporter
 
     return Theme.findOrCreateByTitle(themeTitle).then((theme) =>
       _.extend(@indicatorProperties, {
-        short_name: worksheet['2']['1'].value
-        title: worksheet['2']['1'].value
+        shortName: worksheet['2']['1'].value
+        name: worksheet['2']['1'].value
         theme: theme._id
         indicatorDefinition:
           unit: worksheet['2']['3'].value
-          short_unit: worksheet['2']['3'].value
+          shortUnit: worksheet['2']['3'].value
       })
     )
 
@@ -99,7 +99,7 @@ module.exports = class GDocIndicatorImporter
 
   createOrUpdateIndicator: ->
     existingIndicator = Promise.promisify(Indicator.findOne, Indicator)(
-      'indicatorationConfig.spreadsheet_key': @indicatorProperties.indicatorationConfig.spreadsheet_key
+      'indicatorationConfig.spreadsheetKey': @indicatorProperties.indicatorationConfig.spreadsheetKey
     ).then( (indicator) =>
       @indicatorProperties = mergeAttributesWithDefaults(@indicatorProperties)
       if indicator?
diff --git a/server/mixins/update_indicator_data.coffee b/server/mixins/update_indicator_data.coffee
index d1849535..abf8adcf 100644
--- a/server/mixins/update_indicator_data.coffee
+++ b/server/mixins/update_indicator_data.coffee
@@ -18,7 +18,7 @@ module.exports =
     validateIndicatorDataFields: (indicatorData) ->
       firstRow = indicatorData.data[0]
 
-      errorMsg = "Error validating indicator data for indicator '#{@title}'\n* "
+      errorMsg = "Error validating indicator data for indicator '#{@name}'\n* "
       errors = []
 
       for field in @indicatorDefinition.fields
diff --git a/server/models/indicator.coffee b/server/models/indicator.coffee
index 6d6ae4ad..c9fa8be9 100644
--- a/server/models/indicator.coffee
+++ b/server/models/indicator.coffee
@@ -14,8 +14,8 @@ Page = require('./page').model
 HeadlineService = require '../lib/services/headline'
 
 indicatorSchema = mongoose.Schema(
-  title: String
-  short_name: String
+  name: String
+  shortName: String
   indicatorDefinition: mongoose.Schema.Types.Mixed
   indicatorationConfig:
     type: mongoose.Schema.Types.Mixed
@@ -256,7 +256,7 @@ indicatorSchema.methods.generateMetadataCSV = ->
 
   attributes = []
 
-  attributes.push @title
+  attributes.push @name
 
   Q.nsend(
     @, 'populate', 'theme'
diff --git a/server/models/indicator_data.coffee b/server/models/indicator_data.coffee
index b74d83b0..937f413e 100644
--- a/server/models/indicator_data.coffee
+++ b/server/models/indicator_data.coffee
@@ -10,7 +10,7 @@ indicatorDataSchema = mongoose.Schema(
 
 findIndicatorWithShortName = (indicators, shortName) ->
   for indicator in indicators
-    return indicator if indicator.short_name is shortName
+    return indicator if indicator.shortName is shortName
 
   return null
 
@@ -58,7 +58,7 @@ convertIndicatorDataToJSONBackup = (indicatorData, cb) ->
   Q.nsend(
     Indicator, 'findOne', _id: indicatorData.indicator
   ).then( (indicator)->
-    indicatorData.indicator = indicator.short_name
+    indicatorData.indicator = indicator.shortName
     cb(null, indicatorData)
   ).fail(cb)
 
diff --git a/server/test/integration/api_indicator.coffee b/server/test/integration/api_indicator.coffee
index 24f2a9b2..1276a468 100644
--- a/server/test/integration/api_indicator.coffee
+++ b/server/test/integration/api_indicator.coffee
@@ -16,7 +16,7 @@ Page = require('../../models/page').model
 
 test('POST create', (done) ->
   data =
-    title: "new indicator"
+    name: "new indicator"
 
   request.post({
     url: helpers.appurl('api/indicators/')
@@ -30,7 +30,7 @@ test('POST create', (done) ->
     Indicator
       .findOne(_id: id)
       .exec( (err, indicator) ->
-        assert.equal indicator.title, data.title
+        assert.equal indicator.name, data.name
         done()
       )
   )
@@ -120,14 +120,14 @@ test('GET /api/indicators/ returns all indicators', (done) ->
       indicatorJson = body
 
       assert.equal indicatorJson.length, indicators.length
-      jsonTitles = _.map(indicatorJson, (indicator)->
-        indicator.title
+      jsonNames = _.map(indicatorJson, (indicator)->
+        indicator.name
       )
-      indicatorTitles = _.map(indicators, (indicator)->
-        indicator.title
+      indicatorNames = _.map(indicators, (indicator)->
+        indicator.name
       )
 
-      assert.deepEqual jsonTitles, indicatorTitles
+      assert.deepEqual jsonNames, indicatorNames
       done()
     )
   )
@@ -183,12 +183,12 @@ test('DELETE indicator', (done) ->
 
 test('PUT indicator', (done) ->
   helpers.createIndicator( (err, indicator) ->
-    new_title = "Updated title"
+    newName = "Updated name"
     request.put({
       url: helpers.appurl("/api/indicators/#{indicator.id}")
       json: true
       body:
-        title: new_title
+        name: newName
     }, (err, res, body) ->
       id = body.id
 
@@ -197,7 +197,7 @@ test('PUT indicator', (done) ->
       Indicator
         .findOne(id)
         .exec( (err, indicator) ->
-          assert.equal indicator.title, new_title
+          assert.equal indicator.name, newName
 
           done()
         )
@@ -207,13 +207,13 @@ test('PUT indicator', (done) ->
 
 test('PUT indicator does not fail when an _id is given', (done) ->
   helpers.createIndicator( (err, indicator) ->
-    new_title = "Updated title"
+    newName = "Updated name"
     request.put({
       url: helpers.appurl("/api/indicators/#{indicator.id}")
       json: true
       body:
         _id: indicator.id
-        title: new_title
+        name: newName
     }, (err, res, body) ->
       id = body.id
 
@@ -222,7 +222,7 @@ test('PUT indicator does not fail when an _id is given', (done) ->
       Indicator
         .findOne(id)
         .exec( (err, indicator) ->
-          assert.equal indicator.title, new_title
+          assert.equal indicator.name, newName
           done()
         )
     )
diff --git a/server/test/integration/api_page.coffee b/server/test/integration/api_page.coffee
index 1eec4d1e..58d329f4 100644
--- a/server/test/integration/api_page.coffee
+++ b/server/test/integration/api_page.coffee
@@ -207,7 +207,7 @@ test('POST create - nesting a section in a page when authenticated', (done) ->
 
     Q.nfcall(
       helpers.createIndicator, {
-        title: 'dat indicator'
+        name: 'dat indicator'
         owner: user
       }
     )
@@ -247,7 +247,7 @@ test('POST create - nesting a section in a page when authenticated', (done) ->
       assert.isDefined body.sections[0]._id, "New page Section not assigned an ID"
       assert.equal body.sections[0].title, data.sections[0].title
 
-      assert.equal body.sections[0].indicator.title, theIndicator.title
+      assert.equal body.sections[0].indicator.name, theIndicator.name
 
       Page
         .findOne(_id: id)
@@ -270,7 +270,7 @@ test('POST create - nesting a section in a page fails when not authenticated', (
   helpers.createUser().then((user) ->
     Q.nfcall(
       helpers.createIndicator, {
-        title: 'dat indicator'
+        name: 'dat indicator'
         owner: user
       }
     )
diff --git a/server/test/integration/api_theme.coffee b/server/test/integration/api_theme.coffee
index e656daa7..c2c3e0bb 100644
--- a/server/test/integration/api_theme.coffee
+++ b/server/test/integration/api_theme.coffee
@@ -46,7 +46,7 @@ of child indicators", (done) ->
   )
 
   subIndicators = [
-    new Indicator(title: 'Sub indicator, yo')
+    new Indicator(name: 'Sub indicator, yo')
   ]
   getIndicatorsStub = sinon.stub(Theme::, 'getIndicators', (callback)->
     callback(null, subIndicators)
@@ -89,7 +89,7 @@ of child indicators", (done) ->
       assert.lengthOf reloadedTheme.indicators, 1,
         "Expected one indicator to be returned"
 
-      assert.equal reloadedTheme.indicators[0].title, subIndicators[0].title,
+      assert.equal reloadedTheme.indicators[0].name, subIndicators[0].name,
         "Expected the returned indicators to be correct"
 
       assert.ok getIndicatorsStub.calledOnce,
diff --git a/server/test/integration/indicator_show.coffee b/server/test/integration/indicator_show.coffee
index ad7b0c34..f411afb3 100644
--- a/server/test/integration/indicator_show.coffee
+++ b/server/test/integration/indicator_show.coffee
@@ -14,9 +14,9 @@ User = require('../../models/user').model
 
 suite('Indicator show')
 
-test("When given a valid indicator, I should get a 200 and see the title", (done)->
-  indicatorTitle = "Dat test indicator"
-  indicator = new Indicator(title: indicatorTitle)
+test("When given a valid indicator, I should get a 200 and see the name", (done)->
+  indicatorName = "Dat test indicator"
+  indicator = new Indicator(name: indicatorName)
 
   indicator.save( (err, indicator) ->
     request.get {
@@ -25,7 +25,7 @@ test("When given a valid indicator, I should get a 200 and see the title", (done
       try
         assert.equal res.statusCode, 200
 
-        assert.match body, new RegExp(".*#{indicatorTitle}.*")
+        assert.match body, new RegExp(".*#{indicatorName}.*")
         done()
       catch e
         done(e)
@@ -194,7 +194,7 @@ test("GET /:id/draft clones the Indicator's Page and renders the indicator", (do
   passportStub.login user
 
   helpers.createIndicatorModels([
-    title: 'An indicator'
+    name: 'An indicator'
   ]).then( (indicators) ->
 
     theIndicator = indicators[0]
@@ -247,7 +247,7 @@ test("GET /:id/draft redirects back if the user is not logged in", (done) ->
   theIndicator = originalPage = null
 
   helpers.createIndicatorModels([
-    title: 'An indicator'
+    name: 'An indicator'
   ]).then( (indicators) ->
 
     theIndicator = indicators[0]
@@ -286,7 +286,7 @@ test("GET /:id/discard_draft discards all drafts and renders the published versi
   passportStub.login user
 
   helpers.createIndicatorModels([
-    title: 'An indicator'
+    name: 'An indicator'
   ]).then( (indicators) ->
 
     theIndicator = indicators[0]
@@ -334,7 +334,7 @@ test("GET /:id/discard_draft redirects back if the user is not logged in", (done
   theIndicator = originalPage = draftPage = null
 
   helpers.createIndicatorModels([
-    title: 'An indicator'
+    name: 'An indicator'
   ]).then( (indicators) ->
 
     theIndicator = indicators[0]
@@ -377,7 +377,7 @@ test('GET /:id/publish publishes the current draft and makes it publicly
   passportStub.login user
 
   helpers.createIndicatorModels([
-    title: 'An indicator'
+    name: 'An indicator'
   ]).then( (indicators) ->
 
     theIndicator = indicators[0]
diff --git a/server/test/integration/indicatoration.coffee b/server/test/integration/indicatoration.coffee
index f4b02ca7..767fed64 100644
--- a/server/test/integration/indicatoration.coffee
+++ b/server/test/integration/indicatoration.coffee
@@ -27,9 +27,9 @@ test("calling /admin/updateIndicatorData/{indicatorId}
         featureServer: 1
       }
       range: [
-        {minValue: 0.35, message: "Excellent"},
-        {minValue: 0.15, message: "Good"},
-        {minValue: 0, message: "Bad"}
+        {threshold: 0.35, text: "Excellent"},
+        {threshold: 0.15, text: "Good"},
+        {threshold: 0, text: "Bad"}
       ]
     }
   )
@@ -109,9 +109,9 @@ test("calling /admin/updateIndicatorData/{indicatorId}
         indicatorCode: 'AG.LND.FRST.ZS'
       }
       range: [
-        {minValue: 0.35, message: "Excellent"},
-        {minValue: 0.15, message: "Good"},
-        {minValue: 0, message: "Bad"}
+        {threshold: 0.35, text: "Excellent"},
+        {threshold: 0.15, text: "Good"},
+        {threshold: 0, text: "Bad"}
       ]
     }
   )
diff --git a/server/test/integration/theme_index.coffee b/server/test/integration/theme_index.coffee
index 560d6983..ab4bdd92 100644
--- a/server/test/integration/theme_index.coffee
+++ b/server/test/integration/theme_index.coffee
@@ -17,7 +17,7 @@ test("With a series of themes and indicators, I should see their titles", (done)
     title: 'Theme 1'
   })
   theme1.indicators = [{
-    title: "I am an indicator of theme 1"
+    name: "I am an indicator of theme 1"
     narrativeRecency: "Out of date"
     type: 'esri'
   }]
@@ -25,7 +25,7 @@ test("With a series of themes and indicators, I should see their titles", (done)
     title: 'Theme 2'
   })
   theme2.indicators = [{
-    title: "theme 2 indicator"
+    name: "theme 2 indicator"
     narrativeRecency: "Out of date"
     type: 'esri'
   }]
@@ -47,7 +47,7 @@ test("With a series of themes and indicators, I should see their titles", (done)
       assert.match body, new RegExp(".*#{theme.title}.*")
 
       for indicator in theme.indicators
-        assert.match body, new RegExp(".*#{indicator.title}.*")
+        assert.match body, new RegExp(".*#{indicator.name}.*")
 
     done()
 
diff --git a/server/test/units/gdoc_indicator_importer.coffee b/server/test/units/gdoc_indicator_importer.coffee
index f6935ff7..b8eee74c 100644
--- a/server/test/units/gdoc_indicator_importer.coffee
+++ b/server/test/units/gdoc_indicator_importer.coffee
@@ -40,7 +40,7 @@ test('#import when given a valid spreadsheet key
   setDefinitionStub = sandbox.stub(
     GDocIndicatorImporter::, 'setDefinitionFromWorksheet', ->
       assert.strictEqual(
-        @indicatorProperties.indicatorationConfig.spreadsheet_key,
+        @indicatorProperties.indicatorationConfig.spreadsheetKey,
         spreadsheetKey,
         "Expected the spreadsheet key to be set"
       )
@@ -100,14 +100,14 @@ test('.setDefinitionFromWorksheet builds the indicatorProperties from
 
   indicatorThemeTitle = 'Coastal'
   indicatorProperties =
-    short_name: 'Fish Landings'
-    title: 'Fish Landings'
+    shortName: 'Fish Landings'
+    name: 'Fish Landings'
     indicatorDefinition:
       unit: 'landings'
-      short_unit: 'landings'
+      shortUnit: 'landings'
     indicatorationConfig:
       source: 'gdoc'
-      spreadsheet_key: key
+      spreadsheetKey: key
 
   definitionWorksheet =
     '1': {
@@ -116,7 +116,7 @@ test('.setDefinitionFromWorksheet builds the indicatorProperties from
       '3': { row: '1', col: '3', value: 'What unit does the indicator value use?'}
     },
     '2': {
-      '1': { row: '1', col: '1', value: indicatorProperties.short_name},
+      '1': { row: '1', col: '1', value: indicatorProperties.shortName},
       '2': { row: '1', col: '2', value: indicatorThemeTitle},
       '3': { row: '1', col: '3', value: indicatorProperties.indicatorDefinition.unit}
     }
@@ -142,10 +142,10 @@ test('.setRangesFromWorksheet builds the indicatorProperties from
   indicatorProperties =
     indicatorationConfig:
       source: 'gdoc'
-      spreadsheet_key: key
+      spreadsheetKey: key
       range: [
-        {minValue: 0, message: 'Bad'}
-        {minValue: 0.5, message: 'Good'}
+        {threshold: 0, text: 'Bad'}
+        {threshold: 0.5, text: 'Good'}
       ]
 
   rangesWorksheet =
@@ -157,24 +157,24 @@ test('.setRangesFromWorksheet builds the indicatorProperties from
       '1': {
         row: '1',
         col: '1',
-        value: indicatorProperties.indicatorationConfig.range[0].minValue
+        value: indicatorProperties.indicatorationConfig.range[0].threshold
       },
       '2': {
         row: '1',
         col: '2',
-        value: indicatorProperties.indicatorationConfig.range[0].message
+        value: indicatorProperties.indicatorationConfig.range[0].text
       }
     }
     '3': {
       '1': {
         row: '1',
         col: '1',
-        value: indicatorProperties.indicatorationConfig.range[1].minValue
+        value: indicatorProperties.indicatorationConfig.range[1].threshold
       },
       '2': {
         row: '1',
         col: '2',
-        value: indicatorProperties.indicatorationConfig.range[1].message
+        value: indicatorProperties.indicatorationConfig.range[1].text
       }
     }
 
@@ -194,7 +194,7 @@ test('.createOrUpdateIndicator when there is no existing indicator
   ).then( (indicator)->
     assert.isNotNull indicator, "Expected an indicator to be created"
     assert.strictEqual(
-      indicator.indicatorationConfig.spreadsheet_key,
+      indicator.indicatorationConfig.spreadsheetKey,
       theKey,
       "Expected the created indicator to have the given spreadsheet key"
     )
@@ -207,14 +207,14 @@ test('.createOrUpdateIndicator when there is an existing indicator
 
   theKey = 'hat'
   theIndicator = null
-  theNewTitle = 'new title'
+  theNewName = 'new name'
   builder = new GDocIndicatorImporter(theKey)
-  builder.indicatorProperties.title = theNewTitle
+  builder.indicatorProperties.name = theNewName
 
   helpers.createIndicatorModels([
     indicatorationConfig:
-      spreadsheet_key: theKey
-    title: 'a title'
+      spreadsheetKey: theKey
+    name: 'a name'
   ]).get(0).then((indicator) ->
     theIndicator = indicator
     builder.createOrUpdateIndicator()
@@ -223,7 +223,7 @@ test('.createOrUpdateIndicator when there is an existing indicator
 
     Promise.all([
       findIndicators(
-        'indicatorationConfig.spreadsheet_key': theKey
+        'indicatorationConfig.spreadsheetKey': theKey
       ),
       findIndicators({})
     ])
@@ -236,15 +236,15 @@ test('.createOrUpdateIndicator when there is an existing indicator
       "Expected only one indicator to exist"
 
     assert.strictEqual(
-      spreadsheetIndicators[0].indicatorationConfig.spreadsheet_key,
+      spreadsheetIndicators[0].indicatorationConfig.spreadsheetKey,
       theKey,
       "Expected the found indicator to have the given spreadsheet key"
     )
 
     assert.strictEqual(
-      spreadsheetIndicators[0].title,
-      theNewTitle,
-      "Expected the found indicator to have the updated title"
+      spreadsheetIndicators[0].name,
+      theNewName,
+      "Expected the found indicator to have the updated name"
     )
 
     done()
diff --git a/server/test/units/indicator.coffee b/server/test/units/indicator.coffee
index 279f2df8..278159f5 100644
--- a/server/test/units/indicator.coffee
+++ b/server/test/units/indicator.coffee
@@ -521,7 +521,7 @@ test(".generateMetadataCSV returns CSV arrays containing the name, theme,
 
     Q.nsend(
       Indicator, 'create', {
-        title: "Anne Test Indicator"
+        name: "Anne Test Indicator"
         theme: theme
         indicatorDefinition:
           period: 'quarterly'
@@ -546,9 +546,9 @@ test(".generateMetadataCSV returns CSV arrays containing the name, theme,
       dataRow = csvData[1]
 
       assert.strictEqual titleRow[0], 'Indicator',
-        "Expected the first column to be the indicator title"
-      assert.strictEqual dataRow[0], theIndicator.title,
-        "Expected the indicator title to be the title of the indicator"
+        "Expected the first column to be the indicator name"
+      assert.strictEqual dataRow[0], theIndicator.name,
+        "Expected the indicator name to be the name of the indicator"
 
       assert.strictEqual titleRow[1], 'Theme', "Expected the second column to be the theme"
       assert.strictEqual dataRow[1], theTheme.title,
diff --git a/server/test/units/indicator_data.coffee b/server/test/units/indicator_data.coffee
index 7ed3b44a..1dc4a2d0 100644
--- a/server/test/units/indicator_data.coffee
+++ b/server/test/units/indicator_data.coffee
@@ -20,7 +20,7 @@ test('#seedData given some indicators, links the seed data correctly', (done) ->
   )
 
   indicatorToLinkTo = new Indicator(
-    short_name: 'NO2 Concentration'
+    shortName: 'NO2 Concentration'
   )
 
   IndicatorData.seedData([indicatorToLinkTo]).then((createdIndicatorData) ->
@@ -75,7 +75,7 @@ test("#seedData if the seed includes a 'date' field, convert it to an actual dat
 test("#dataToSeedJSON returns indicator data as JSON with the indicator field
 denormalised to the indicator name", (done) ->
   indicator = new Indicator(
-    short_name: 'The indicator'
+    shortName: 'The indicator'
   )
   indicatorData = new IndicatorData(
     data: [
@@ -85,7 +85,7 @@ denormalised to the indicator name", (done) ->
     ]
   )
   indicator2 = new Indicator(
-    short_name: 'second Indicator'
+    shortName: 'second Indicator'
   )
   indicatorData2 = new IndicatorData(
     data: [
@@ -118,7 +118,7 @@ denormalised to the indicator name", (done) ->
         "Expected the seed data to have only 1 entry"
 
       indicator1Data = seedData[0]
-      assert.strictEqual indicator1Data.indicator, indicator.short_name,
+      assert.strictEqual indicator1Data.indicator, indicator.shortName,
         "Expected the seed data 'indicator' attribute to be the indicator short name"
 
       assert.deepEqual indicator1Data.data, indicatorData.data,
@@ -128,7 +128,7 @@ denormalised to the indicator name", (done) ->
         "Expected the _id attribute to be removed"
 
       indicator2Data = seedData[1]
-      assert.strictEqual indicator2Data.indicator, indicator2.short_name,
+      assert.strictEqual indicator2Data.indicator, indicator2.shortName,
         "Expected the seed data 'indicator' attribute to be the indicator short name"
 
       assert.deepEqual indicator2Data.data, indicatorData2.data,
diff --git a/server/test/units/theme.coffee b/server/test/units/theme.coffee
index 2e153de4..a3b9944c 100644
--- a/server/test/units/theme.coffee
+++ b/server/test/units/theme.coffee
@@ -24,11 +24,11 @@ test('.getFatThemes returns all the themes
     themeAttributes
   ).then((themes) ->
     indicatorAttributes = [{
-      title: "I'm an indicator of theme 1"
+      name: "I'm an indicator of theme 1"
       theme: themes[0]._id
       type: "esri"
     },{
-      title: "theme 2 indicator"
+      name: "theme 2 indicator"
       theme: themes[1]._id
       type: "esri"
     }]
@@ -69,8 +69,8 @@ test('.getFatThemes returns all the themes
     assert.lengthOf returnedThemes[0].indicators, 1
     assert.lengthOf returnedThemes[1].indicators, 1
 
-    assert.strictEqual returnedThemes[0].indicators[0].title, indicatorAttributes[0].title
-    assert.strictEqual returnedThemes[1].indicators[0].title, indicatorAttributes[1].title
+    assert.strictEqual returnedThemes[0].indicators[0].name, indicatorAttributes[0].name
+    assert.strictEqual returnedThemes[1].indicators[0].name, indicatorAttributes[1].name
 
     assert.property returnedThemes[0].indicators[0], 'page',
       "Expected indicators to have their page attribute populated"
@@ -87,11 +87,11 @@ test('#getFetThemes only returns themes with indicators of type ESRI', (done) ->
     [{title: 'a theme'}]
   ).then((themes) ->
     indicatorAttributes = [{
-      title: "ESRI indicator"
+      name: "ESRI indicator"
       theme: themes[0]._id
       type: "esri"
     },{
-      title: "world bank indicator"
+      name: "world bank indicator"
       theme: themes[0]._id
       type: "worldbank"
     }]
@@ -150,7 +150,7 @@ test('.getIndicatorsByTheme returns all Indicators for given Theme', (done) ->
     theThemes = themes
 
     indicatorAttributes = [{
-      title: "I'm an indicator of theme 1"
+      name: "I'm an indicator of theme 1"
       theme: themes[0]._id
       type: 'esri'
     }]
@@ -166,7 +166,7 @@ test('.getIndicatorsByTheme returns all Indicators for given Theme', (done) ->
 
       assert.lengthOf returnedIndicators, 1
 
-      assert.strictEqual returnedIndicators[0].title, indicatorAttributes[0].title
+      assert.strictEqual returnedIndicators[0].name, indicatorAttributes[0].name
       done()
     )
   ).catch(done)
@@ -185,11 +185,11 @@ test('.getIndicatorsByTheme supports an optional filter object', (done) ->
     theThemes = themes
 
     indicatorAttributes = [{
-      title: "I'm an indicator of theme 1"
+      name: "I'm an indicator of theme 1"
       theme: themes[0]._id
       dpsir: pressure: true
     }, {
-      title: "I'm also an indicator of theme 1"
+      name: "I'm also an indicator of theme 1"
       theme: themes[0]._id
       dpsir: state: true
     }]
@@ -206,7 +206,7 @@ test('.getIndicatorsByTheme supports an optional filter object', (done) ->
       assert.lengthOf indicators, 1,
         "Expected 1 indicator to be returned"
 
-      assert.strictEqual indicators[0].title, indicatorAttributes[1].title
+      assert.strictEqual indicators[0].name, indicatorAttributes[1].name
 
       done()
     catch err
@@ -223,7 +223,7 @@ test('.getIndicators returns all Indicators for given Theme', (done) ->
     themeAttributes
   ).then( (themes) ->
     indicatorAttributes = [{
-      title: "I'm an indicator of theme 1"
+      name: "I'm an indicator of theme 1"
       theme: themes[0]._id
     }]
 
@@ -236,7 +236,7 @@ test('.getIndicators returns all Indicators for given Theme', (done) ->
           throw new Error(err)
 
         assert.lengthOf returnedIndicators, 1
-        assert.strictEqual returnedIndicators[0].title, indicatorAttributes[0].title
+        assert.strictEqual returnedIndicators[0].name, indicatorAttributes[0].name
 
         done()
       )
diff --git a/server/views/admin/updateAll.hbs b/server/views/admin/updateAll.hbs
index ca2fe0bc..f31a26de 100644
--- a/server/views/admin/updateAll.hbs
+++ b/server/views/admin/updateAll.hbs
@@ -29,7 +29,7 @@
         <tr>
           <td>
             <p>
-            <a href="/indicators/{{id}}">{{title}}</a>
+            <a href="/indicators/{{id}}">{{name}}</a>
             </p>
             <small>{{id}}</small>
           </td>
diff --git a/server/views/dashboard.hbs b/server/views/dashboard.hbs
index d42b49b2..dfa4b046 100644
--- a/server/views/dashboard.hbs
+++ b/server/views/dashboard.hbs
@@ -56,9 +56,9 @@
                 <small>{{indicatorDefinition.unit}}</small>
               </span>
               <span class="indicator-info">
-                <h3><a href="/indicators/{{id}}">Narrative for {{title}}</a></h3>
-                <h4><span class="bold"><a href="/indicators/{{id}}">{{title}}</a></span>| <i class="icon-bookmark"></i> Watch this indicator</h4>
-                <p>This is the description for the <span style="font-style: italic;">{{title}}</span> indicator.</p>
+                <h3><a href="/indicators/{{id}}">Narrative for {{name}}</a></h3>
+                <h4><span class="bold"><a href="/indicators/{{id}}">{{name}}</a></span>| <i class="icon-bookmark"></i> Watch this indicator</h4>
+                <p>This is the description for the <span style="font-style: italic;">{{name}}</span> indicator.</p>
                 <p class="report-link">Published in <a href="#">Report</a></p>
               </span>
             </div>
diff --git a/server/views/indicators/show.hbs b/server/views/indicators/show.hbs
index 479caebe..fe4e8591 100644
--- a/server/views/indicators/show.hbs
+++ b/server/views/indicators/show.hbs
@@ -40,7 +40,7 @@
       <div class="parameter {{#if indicator.page.is_draft}}p-select{{/if}}">
         <div class="score">
           <span class="number">
-            {{indicator.page.headline.value}} {{indicator.indicatorDefinition.short_unit}}
+            {{indicator.page.headline.value}} {{indicator.indicatorDefinition.shortUnit}}
           </span>
           <span class="keyword">
             {{indicator.page.headline.text}}
@@ -54,7 +54,7 @@
         {{> dpsir indicator.dpsir }}
       {{/if}}
 
-      <h1>{{indicator.title}}</h1>
+      <h1>{{indicator.name}}</h1>
     </header>
 
     <div class='main-content'>
diff --git a/server/views/partials/indicatorList.hbs b/server/views/partials/indicatorList.hbs
index b1af2fe3..152ee2ed 100644
--- a/server/views/partials/indicatorList.hbs
+++ b/server/views/partials/indicatorList.hbs
@@ -1,14 +1,14 @@
 {{#this}}
-  <a id="indicator-{{css-classify title}}" class="indicator-box" href="/indicators/{{id}}">
-    <div class="full-name">{{title}}<span>›</span></div>
+  <a id="indicator-{{css-classify name}}" class="indicator-box" href="/indicators/{{id}}">
+    <div class="full-name">{{name}}<span>›</span></div>
     <div class="brief">{{truncate description 80}}</div>
     <div class="box-header">
-      <div class="title"><h3><span>{{short_name}}</span></h3></div>
+      <div class="title"><h3><span>{{shortName}}</span></h3></div>
     </div>
     <div class="context-text {{css-classify page.headline.text}}">{{page.headline.text}}</div>
     <div class="parameter">
       <h4>{{page.headline.value}}</h4>
-      <div class="unit">{{indicatorDefinition.short_unit}}</div>
+      <div class="unit">{{indicatorDefinition.shortUnit}}</div>
     </div>
     <div class="last-update">
       <span class="status {{css-classify narrativeRecency}}"></span>
diff --git a/server/views/themes/index.hbs b/server/views/themes/index.hbs
index 3f606aab..3ceafcb5 100644
--- a/server/views/themes/index.hbs
+++ b/server/views/themes/index.hbs
@@ -77,7 +77,7 @@
                   <a href="/indicators/{{id}}">
                     <li>
                         <span class="status {{css-classify narrativeRecency}}"></span>
-                        <span>{{title}}</span>
+                        <span>{{name}}</span>
                     </li>
                   </a>
                 {{/unless}}