diff --git a/core/.gitignore b/core/.gitignore
index bd2e040880..b0514aba6e 100644
--- a/core/.gitignore
+++ b/core/.gitignore
@@ -1,6 +1,6 @@
 milvus/
-conf/server_config.yaml
-conf/server_config.yaml.ori
+conf/milvus.yaml
+conf/milvus.yaml.ori
 conf/log_config.conf
 src/config.h
 src/version.h
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 45980aa35a..e3d8a47d41 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -232,8 +232,8 @@ if ( MILVUS_GPU_VERSION )
 else ()
     set( GPU_ENABLE "false" )
 endif ()
-configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/conf/server_config.template
-                ${CMAKE_CURRENT_SOURCE_DIR}/conf/server_config.yaml @ONLY)
+configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/conf/milvus.template
+                ${CMAKE_CURRENT_SOURCE_DIR}/conf/milvus.yaml @ONLY)
 
 install(DIRECTORY scripts/
         DESTINATION scripts
@@ -247,7 +247,7 @@ install(DIRECTORY scripts/migration
         GROUP_EXECUTE GROUP_READ
         WORLD_EXECUTE WORLD_READ)
 install(FILES
-        conf/server_config.yaml
+        conf/milvus.yaml
         DESTINATION
         conf)
 
diff --git a/core/conf/demo/server_config.yaml b/core/conf/demo/milvus.yaml
similarity index 100%
rename from core/conf/demo/server_config.yaml
rename to core/conf/demo/milvus.yaml
diff --git a/core/conf/server_config.template b/core/conf/milvus.template
similarity index 100%
rename from core/conf/server_config.template
rename to core/conf/milvus.template
diff --git a/core/scripts/start_server.sh b/core/scripts/start_server.sh
index 15d2cf0872..3a915768c6 100755
--- a/core/scripts/start_server.sh
+++ b/core/scripts/start_server.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-../bin/milvus_server -c ../conf/server_config.yaml
+../bin/milvus_server -c ../conf/milvus.yaml
 
diff --git a/core/src/server/DBWrapper.cpp b/core/src/server/DBWrapper.cpp
index f33305cc0a..6b84e546db 100644
--- a/core/src/server/DBWrapper.cpp
+++ b/core/src/server/DBWrapper.cpp
@@ -90,8 +90,7 @@ DBWrapper::StartService() {
     s = CommonUtil::CreateDirectory(opt.meta_.path_);
     if (!s.ok()) {
         std::cerr << "Error: Failed to create database primary path: " << path
-                  << ". Possible reason: db_config.primary_path is wrong in server_config.yaml or not available."
-                  << std::endl;
+                  << ". Possible reason: db_config.primary_path is wrong in milvus.yaml or not available." << std::endl;
         kill(0, SIGUSR1);
     }
 
diff --git a/core/start_server.sh b/core/start_server.sh
index 0ae47e6bdf..0e48c08228 100755
--- a/core/start_server.sh
+++ b/core/start_server.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-./cmake_build/src/milvus_server -c ./conf/server_config.yaml &
+./cmake_build/src/milvus_server -c ./conf/milvus.yaml &
 
diff --git a/core/unittest/storage/utils.h b/core/unittest/storage/utils.h
index 20478bb169..5f40f0bb60 100644
--- a/core/unittest/storage/utils.h
+++ b/core/unittest/storage/utils.h
@@ -14,7 +14,7 @@
 #include <gtest/gtest.h>
 
 static const char* CONFIG_PATH = "/tmp/milvus_test/";
-static const char* CONFIG_FILE = "server_config.yaml";
+static const char* CONFIG_FILE = "milvus.yaml";
 
 class StorageTest : public ::testing::Test {
  protected:
diff --git a/docker/deploy/cpu/centos7/Dockerfile b/docker/deploy/cpu/centos7/Dockerfile
index 57ccf196f4..8294e98a57 100644
--- a/docker/deploy/cpu/centos7/Dockerfile
+++ b/docker/deploy/cpu/centos7/Dockerfile
@@ -26,6 +26,6 @@ COPY --from=openblas /usr/lib/libopenblas*.so* /var/lib/milvus/lib/
 
 WORKDIR /var/lib/milvus
 
-CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/server_config.yaml" ]
+CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/milvus.yaml" ]
 
 EXPOSE 19530
diff --git a/docker/deploy/cpu/ubuntu16.04/Dockerfile b/docker/deploy/cpu/ubuntu16.04/Dockerfile
index 453a5671b7..44e6d4ad6f 100644
--- a/docker/deploy/cpu/ubuntu16.04/Dockerfile
+++ b/docker/deploy/cpu/ubuntu16.04/Dockerfile
@@ -23,6 +23,6 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/var/lib/milvus/lib"
 
 WORKDIR /var/lib/milvus
 
-CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/server_config.yaml" ]
+CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/milvus.yaml" ]
 
 EXPOSE 19530
diff --git a/docker/deploy/cpu/ubuntu18.04/Dockerfile b/docker/deploy/cpu/ubuntu18.04/Dockerfile
index 37f750ecb8..f1ae8ce978 100644
--- a/docker/deploy/cpu/ubuntu18.04/Dockerfile
+++ b/docker/deploy/cpu/ubuntu18.04/Dockerfile
@@ -27,7 +27,7 @@ COPY --from=openblas /usr/lib/libopenblas*.so* /var/lib/milvus/lib/
 
 WORKDIR /var/lib/milvus
 
-CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/server_config.yaml" ]
+CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/milvus.yaml" ]
 
 EXPOSE 19530
 
diff --git a/docker/deploy/gpu/centos7/Dockerfile b/docker/deploy/gpu/centos7/Dockerfile
index daed9a60de..f284b779a8 100644
--- a/docker/deploy/gpu/centos7/Dockerfile
+++ b/docker/deploy/gpu/centos7/Dockerfile
@@ -28,6 +28,6 @@ COPY --from=openblas /usr/lib/libopenblas*.so* /var/lib/milvus/lib/
 
 WORKDIR /var/lib/milvus
 
-CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/server_config.yaml" ]
+CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/milvus.yaml" ]
 
 EXPOSE 19530
diff --git a/docker/deploy/gpu/ubuntu16.04/Dockerfile b/docker/deploy/gpu/ubuntu16.04/Dockerfile
index 1249fd9769..dbe5e5b9c4 100644
--- a/docker/deploy/gpu/ubuntu16.04/Dockerfile
+++ b/docker/deploy/gpu/ubuntu16.04/Dockerfile
@@ -27,7 +27,7 @@ ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/var/lib/milvus/lib"
 
 WORKDIR /var/lib/milvus
 
-CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/server_config.yaml" ]
+CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/milvus.yaml" ]
 
 EXPOSE 19530
 
diff --git a/docker/deploy/gpu/ubuntu18.04/Dockerfile b/docker/deploy/gpu/ubuntu18.04/Dockerfile
index 0aa2c4ac36..5b4348acc3 100644
--- a/docker/deploy/gpu/ubuntu18.04/Dockerfile
+++ b/docker/deploy/gpu/ubuntu18.04/Dockerfile
@@ -31,7 +31,7 @@ COPY --from=openblas /usr/lib/libopenblas*.so* /var/lib/milvus/lib/
 
 WORKDIR /var/lib/milvus
 
-CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/server_config.yaml" ]
+CMD [ "/var/lib/milvus/bin/milvus_server", "-c", "/var/lib/milvus/conf/milvus.yaml" ]
 
 EXPOSE 19530
 
diff --git a/docker/docker-compose-monitor.yml b/docker/docker-compose-monitor.yml
index 185ad86cc9..8ad6d4d6bb 100644
--- a/docker/docker-compose-monitor.yml
+++ b/docker/docker-compose-monitor.yml
@@ -49,7 +49,7 @@ services:
         environment:
             WEB_APP: host.docker.internal
         volumes:
-            - ../core/conf/server_config.yaml:/var/lib/milvus/conf/server_config.yaml
+            - ../core/conf/milvus.yaml:/var/lib/milvus/conf/milvus.yaml
             - ../core/conf/log_config.conf:/var/lib/milvus/conf/log_config.conf
         ports:
             - "8080:8080"