diff --git a/README.md b/README.md
index f223bff0e..9dde1759c 100644
--- a/README.md
+++ b/README.md
@@ -95,8 +95,8 @@ If it installs successfully, you will need to make changes to the following
 two files to reflect your system settings, especially where kafka server is
 located::
 
-    /etc/monasca/monasca.ini
-    /etc/monasca/monasca.conf
+    /etc/monasca/api-config.ini
+    /etc/monasca/api-config.conf
 
 Once the configurations are modified to match your environment, you can start
 up the server by following the following instructions.
@@ -105,11 +105,11 @@ To start the server, run the following command:
 
     Running the server in foreground mode
     gunicorn -k eventlet --worker-connections=2000 --backlog=1000
-             --paste /etc/monasca/monasca.ini
+             --paste /etc/monasca/api-config.ini
 
     Running the server as daemons
     gunicorn -k eventlet --worker-connections=2000 --backlog=1000
-             --paste /etc/monasca/monasca.ini -D
+             --paste /etc/monasca/api-config.ini -D
 
 To check if the code follows python coding style, run the following command
 from the root directory of this project
diff --git a/devstack/files/influxdb/influxdb.conf b/devstack/files/influxdb/influxdb.conf
index e73e1ec6f..157021ded 100644
--- a/devstack/files/influxdb/influxdb.conf
+++ b/devstack/files/influxdb/influxdb.conf
@@ -56,7 +56,7 @@ reporting-disabled = false
 
   # Controls the engine type for new shards. Options are b1, bz1, or tsm1.
   # b1 is the 0.9.2 storage engine, bz1 is the 0.9.3 and 0.9.4 engine.
-  # tsm1 is the 0.9.5 engine and is currenly EXPERIMENTAL. Until 0.9.5 is
+  # tsm1 is the 0.9.5 engine and is currently EXPERIMENTAL. Until 0.9.5 is
   # actually released data written into a tsm1 engine may be need to be wiped
   # between upgrades.
   # engine ="bz1"
diff --git a/devstack/files/kafka/server.properties b/devstack/files/kafka/server.properties
index e830a3e02..ec6b1b3d9 100644
--- a/devstack/files/kafka/server.properties
+++ b/devstack/files/kafka/server.properties
@@ -55,7 +55,7 @@ socket.request.max.bytes=104857600
 
 ############################# Log Basics #############################
 
-# A comma seperated list of directories under which to store log files
+# A comma separated list of directories under which to store log files
 log.dirs=/var/kafka
 
 auto.create.topics.enable=false
diff --git a/docs/monasca-api-spec.md b/docs/monasca-api-spec.md
index 0915532ec..4a8ca42cc 100644
--- a/docs/monasca-api-spec.md
+++ b/docs/monasca-api-spec.md
@@ -2297,11 +2297,11 @@ Returns a JSON object with a 'links' array of links and an 'elements' array of a
     "links": [
         {
             "rel": "self",
-            "href": "http://192.168.10.4:8080/v2.0/alarms?name=cpu.system_perc&dimensions=hostname%3Adevstack&state=UNDETERMINED"
+            "href": "http://192.168.10.4:8080/v2.0/alarms?metric_name=cpu.system_perc&metric_dimensions=hostname%3Adevstack&state=UNDETERMINED"
         },
         {
             "rel": "next",
-            "href": "http://192.168.10.4:8080/v2.0/alarms?offset=f9935bcc-9641-4cbf-8224-0993a947ea83&name=cpu.system_perc&dimensions=hostname%3Adevstack&state=UNDETERMINED"
+            "href": "http://192.168.10.4:8080/v2.0/alarms?offset=f9935bcc-9641-4cbf-8224-0993a947ea83&metric_name=cpu.system_perc&metric_dimensions=hostname%3Adevstack&state=UNDETERMINED"
         }
     ],
     "elements": [
@@ -2403,7 +2403,7 @@ Returns a JSON object containing the following fields:
        "links": [
            {
                "rel": "self",
-               "href": "http://192.168.10.4:8080/v2.0/alarms/count?name=cpu.system_perc&dimensions=hostname%3Adevstack&group_by=state,lifecycle_state"
+               "href": "http://192.168.10.4:8080/v2.0/alarms/count?metric_name=cpu.system_perc&metric_dimensions=hostname%3Adevstack&group_by=state,lifecycle_state"
            }
        ],
        "columns": ["count", "state", "lifecycle_state"],