diff --git a/README.md b/README.md
index aba972f854b3d..fcdcca8806b81 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ For the daring, snapshot builds are available. These builds are created after ea
 
 | platform |  |
 | --- | --- |
-| OSX | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-darwin-x64.tar.gz) |
-| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-linux-x64.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana_5.0.0-snapshot_amd64.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0_snapshot-1.x86_64.rpm) |
-| Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-linux-x86.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana_5.0.0-snapshot_i386.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0_snapshot-1.i386.rpm) |
-| Windows | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-snapshot-windows.zip) |
+| OSX | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-darwin-x64.tar.gz) |
+| Linux x64 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-linux-x64.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana_5.0.0-SNAPSHOT_amd64.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0_SNAPSHOT-1.x86_64.rpm) |
+| Linux x86 | [tar](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-linux-x86.tar.gz) [deb](https://download.elastic.co/kibana/kibana-snapshot/kibana_5.0.0-SNAPSHOT_i386.deb) [rpm](https://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0_SNAPSHOT-1.i386.rpm) |
+| Windows | [zip](http://download.elastic.co/kibana/kibana-snapshot/kibana-5.0.0-SNAPSHOT-windows.zip) |
diff --git a/src/cli_plugin/install/__tests__/kibana.js b/src/cli_plugin/install/__tests__/kibana.js
index 2ae0a1e2589ab..e3c860f82a22b 100644
--- a/src/cli_plugin/install/__tests__/kibana.js
+++ b/src/cli_plugin/install/__tests__/kibana.js
@@ -44,8 +44,8 @@ describe('kibana cli', function () {
             workingPath: testWorkingPath,
             tempArchiveFile: tempArchiveFilePath,
             plugin: 'test-plugin',
-            version: '5.0.0-snapshot',
-            plugins: [ { name: 'foo', path: join(testWorkingPath, 'foo'), version: '5.0.0-snapshot' } ]
+            version: '5.0.0-SNAPSHOT',
+            plugins: [ { name: 'foo', path: join(testWorkingPath, 'foo'), version: '5.0.0-SNAPSHOT' } ]
           };
           const errorStub = sinon.stub();
 
diff --git a/src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json b/src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json
index 30990d109cad1..8767232dcdc1c 100644
--- a/src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json
+++ b/src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json
@@ -13,7 +13,7 @@
          {
             "_index": ".kibana",
             "_type": "config",
-            "_id": "4.0.1-snapshot",
+            "_id": "4.0.1-SNAPSHOT",
             "_score": 1,
             "_source": {
                "buildNum": 5921,
diff --git a/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js b/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
index 56713adcaeae5..0e9b064393d15 100644
--- a/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
+++ b/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
@@ -39,8 +39,8 @@ describe('plugins/elasticsearch', function () {
     upgradeDoc('4.0.0-rc2', '4.0.2', true);
     upgradeDoc('4.0.1', '4.1.0-rc', true);
     upgradeDoc('4.0.0-rc1', '4.0.0', true);
-    upgradeDoc('4.0.0-rc1-snapshot', '4.0.0', false);
-    upgradeDoc('4.1.0-rc1-snapshot', '4.1.0-rc1', false);
+    upgradeDoc('4.0.0-rc1-SNAPSHOT', '4.0.0', false);
+    upgradeDoc('4.1.0-rc1-SNAPSHOT', '4.1.0-rc1', false);
     upgradeDoc('5.0.0-alpha1', '5.0.0', false);
 
     it('should handle missing _id field', function () {
diff --git a/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js b/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js
index fb871ba001a9f..96e744c11ac10 100644
--- a/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js
+++ b/src/plugins/elasticsearch/lib/__tests__/upgrade_config.js
@@ -94,7 +94,7 @@ describe('plugins/elasticsearch', function () {
     it('should create new config if the nothing is upgradeable', function () {
       get.withArgs('pkg.buildNum').returns(9833);
       client.create.returns(Promise.resolve());
-      const response = { hits: { hits: [ { _id: '4.0.1-alpha3' }, { _id: '4.0.1-beta1' }, { _id: '4.0.0-snapshot1' } ] } };
+      const response = { hits: { hits: [ { _id: '4.0.1-alpha3' }, { _id: '4.0.1-beta1' }, { _id: '4.0.0-SNAPSHOT1' } ] } };
       return upgrade(response).then(function (resp) {
         sinon.assert.calledOnce(client.create);
         const params = client.create.args[0][0];
diff --git a/src/plugins/elasticsearch/lib/__tests__/version_satisfies.js b/src/plugins/elasticsearch/lib/__tests__/version_satisfies.js
index c63f6ce09d1d9..58d14e39175f3 100644
--- a/src/plugins/elasticsearch/lib/__tests__/version_satisfies.js
+++ b/src/plugins/elasticsearch/lib/__tests__/version_satisfies.js
@@ -21,9 +21,9 @@ const versionChecks = [
   ['2.0.1', '^2.0.0', true],
   ['2.1.1', '^2.1.0', true],
   ['2.2.0', '^2.1.0', true],
-  ['3.0.0-snapshot', '^2.1.0', false],
+  ['3.0.0-SNAPSHOT', '^2.1.0', false],
   ['3.0.0', '^2.1.0', false],
-  ['2.10.20-snapshot', '^2.10.20', true],
+  ['2.10.20-SNAPSHOT', '^2.10.20', true],
   ['2.10.999', '^2.10.20', true],
 ];
 
diff --git a/tasks/config/build.js b/tasks/config/build.js
index c1778cd4dbf8e..2cceff4957bbe 100644
--- a/tasks/config/build.js
+++ b/tasks/config/build.js
@@ -11,5 +11,5 @@ export default (grunt) => {
 };
 
 function buildVersion(isRelease, version) {
-  return isRelease ? version : `${version}-snapshot`;
+  return isRelease ? version : `${version}-SNAPSHOT`;
 }