diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c3ed347..f34d52e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 * [CHANGE] We now allow queries that are 32 days long. For example, rate(metric[32d]). Before it was 31d. #173
 * [CHANGE] Renamed `container_name` and `pod_name` label names to `container` and `pod` respectively. This is required in order to comply with cAdvisor metrics changes shipped with Kubernetes 1.16. #179
 * [CHANGE] Removed the `experimental` prefix from blocks storage CLI flags. #179
+* [CHANGE] Rename flags `store-gateway.replication-factor` and `store-gateway.tokens-file-path` to `store-gateway.sharding-ring.replication-factor` and `store-gateway.sharding-ring.tokens-file-path` in anticipation of v1.4 release. #191
 * [ENHANCEMENT] Enable support for HA in the Cortex Alertmanager #147
 * [ENHANCEMENT] Support `alertmanager.fallback_config` option in the Alertmanager. #179
 * [ENHANCEMENT] Add support for S3 block storage. #181
diff --git a/cortex/config.libsonnet b/cortex/config.libsonnet
index eb777610..f80fbcc5 100644
--- a/cortex/config.libsonnet
+++ b/cortex/config.libsonnet
@@ -159,7 +159,7 @@
       'store-gateway.sharding-ring.store': 'consul',
       'store-gateway.sharding-ring.consul.hostname': 'consul.%s.svc.cluster.local:8500' % $._config.namespace,
       'store-gateway.sharding-ring.prefix': '',
-      'store-gateway.replication-factor': $._config.store_gateway_replication_factor,
+      'store-gateway.sharding-ring.replication-factor': $._config.store_gateway_replication_factor,
     },
     gcsBlocksStorageConfig:: $._config.genericBlocksStorageConfig {
       'blocks-storage.backend': 'gcs',
diff --git a/cortex/tsdb.libsonnet b/cortex/tsdb.libsonnet
index fbce8eff..65770f08 100644
--- a/cortex/tsdb.libsonnet
+++ b/cortex/tsdb.libsonnet
@@ -176,7 +176,7 @@
 
       // Persist ring tokens so that when the store-gateway will be restarted
       // it will pick the same tokens
-      'store-gateway.tokens-file-path': '/data/tokens',
+      'store-gateway.sharding-ring.tokens-file-path': '/data/tokens',
     } + $.blocks_chunks_caching_config + $.blocks_metadata_caching_config,
 
   store_gateway_ports:: $.util.defaultPorts,