AMBARI-9534 AMS Service Rename (mpapirkovskyy via dsen)

93 files changed, 318 insertions, 457 deletions

diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index ebfdc681c4..1222e36379 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,7 @@
   <artifactId>ambari-admin</artifactId>
   <packaging>jar</packaging>
   <name>Ambari Admin View</name>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <description>Admin control panel</description>
   <build>
     <plugins>
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index be12dc3837..8537b28400 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -19,14 +19,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-agent</artifactId>
   <packaging>pom</packaging>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <name>Ambari Agent</name>
   <description>Ambari Agent</description>
   <properties>
diff --git a/ambari-client/groovy-client/pom.xml b/ambari-client/groovy-client/pom.xml
index cc823def37..cf7a77fa45 100644
--- a/ambari-client/groovy-client/pom.xml
+++ b/ambari-client/groovy-client/pom.xml
@@ -12,14 +12,14 @@
   <parent>
     <artifactId>ambari-client</artifactId>
     <groupId>org.apache.ambari</groupId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <relativePath>../../ambari-client/</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>groovy-client</artifactId>
   <packaging>jar</packaging>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <name>Ambari Groovy Client</name>
   <description>Ambari Groovy client</description>
   <properties>
diff --git a/ambari-client/pom.xml b/ambari-client/pom.xml
index e489d927a2..201328c5f4 100755
--- a/ambari-client/pom.xml
+++ b/ambari-client/pom.xml
@@ -20,14 +20,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-client</artifactId>
   <packaging>pom</packaging>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <name>Ambari Client</name>
   <description>Ambari client</description>
   <modules>
diff --git a/ambari-client/python-client/pom.xml b/ambari-client/python-client/pom.xml
index e16bbc28bc..fb7c49861a 100644
--- a/ambari-client/python-client/pom.xml
+++ b/ambari-client/python-client/pom.xml
@@ -19,14 +19,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-client</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <relativePath>../../ambari-client</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>python-client</artifactId>
   <packaging>pom</packaging>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <name>Ambari Python Client</name>
   <description>Ambari Python client</description>
   <properties>
diff --git a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ams-site.xml b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ams-site.xml
index c2dd10024d..41c322086a 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ams-site.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ams-site.xml
@@ -20,6 +20,6 @@
 
 <configuration>
 
-  <!-- Site specific AMS configuration properties -->
+  <!-- Site specific AMBARI_METRICS configuration properties -->
 
 </configuration>
diff --git a/ambari-metrics/ambari-metrics-timelineservice/conf/windows/ams-site.xml b/ambari-metrics/ambari-metrics-timelineservice/conf/windows/ams-site.xml
index c2dd10024d..41c322086a 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/conf/windows/ams-site.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/conf/windows/ams-site.xml
@@ -20,6 +20,6 @@
 
 <configuration>
 
-  <!-- Site specific AMS configuration properties -->
+  <!-- Site specific AMBARI_METRICS configuration properties -->
 
 </configuration>
diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/scripts/ams_query.py b/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/scripts/ams_query.py
index d51357ad0e..7fea3dfaea 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/scripts/ams_query.py
+++ b/ambari-metrics/ambari-metrics-timelineservice/src/main/resources/scripts/ams_query.py
@@ -83,7 +83,7 @@ def main(argv=None):
   parser = optparse.OptionParser()
 
   parser.add_option("-H", "--host", dest="host",
-                    help="AMS host")
+                    help="Ambari Metrics host")
   parser.add_option("-t", "--starttime", dest="start_time_secs",
                     default=int(time.time()),
                     help="start time in seconds, default value is current time")
@@ -92,7 +92,7 @@ def main(argv=None):
   (options, args) = parser.parse_args()
 
   if options.host is None:
-    print "AMS host name is required (--host or -h)"
+    print "Ambari Metrics host name is required (--host or -h)"
     exit(-1)
 
   if options.node_names is None:
diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java
index 6b069188ed..2fdedb2353 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java
+++ b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestApplicationHistoryClientService.java
@@ -50,7 +50,7 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-// Timeline service client support is not enabled for AMS
+// Timeline service client support is not enabled for AMBARI_METRICS
 @Ignore
 public class TestApplicationHistoryClientService extends
     ApplicationHistoryStoreTestUtils {
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 6bae5abafd..d08e2ee3ed 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -18,11 +18,11 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
   </parent>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-project</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <description>Apache Ambari Project POM</description>
   <name>Apache Ambari Project POM</name>
   <licenses>
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 5c16c2cb0f..210d2f4d3c 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
   <artifactId>ambari-server</artifactId>
   <packaging>${packagingFormat}</packaging>
   <name>Ambari Server</name>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <description>Ambari Server</description>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -166,7 +166,7 @@
             <exclude>src/main/resources/stacks/HDP/2.1.GlusterFS/services/YARN/package/templates/exclude_hosts_list.j2</exclude>
             <exclude>src/main/windows/ambari-server.cmd</exclude>
             <exclude>src/main/windows/ambari-server.ps1</exclude>
-            <exclude>src/main/resources/common-services/AMS/0.1.0/package/templates/smoketest_metrics.json.j2</exclude>
+            <exclude>src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/smoketest_metrics.json.j2</exclude>
             <exclude>src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/balancer-emulator/balancer-err.log</exclude>
             <exclude>src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/balancer-emulator/balancer.log</exclude>
             <exclude>src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/balancer-emulator/balancer.log</exclude>
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/Role.java b/ambari-server/src/main/java/org/apache/ambari/server/Role.java
index 228b25b5a9..59ae0017be 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/Role.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/Role.java
@@ -107,9 +107,9 @@ public class Role {
   public static final Role KDC_SERVER = valueOf("KDC_SERVER");
   public static final Role KERBEROS_CLIENT = valueOf("KERBEROS_CLIENT");
   public static final Role KERBEROS_SERVICE_CHECK = valueOf("KERBEROS_SERVICE_CHECK");
-  public static final Role METRIC_COLLECTOR = valueOf("METRIC_COLLECTOR");
-  public static final Role METRIC_MONITOR = valueOf("METRIC_MONITOR");
-  public static final Role AMS_SERVICE_CHECK = valueOf("AMS_SERVICE_CHECK");
+  public static final Role METRICS_COLLECTOR = valueOf("METRICS_COLLECTOR");
+  public static final Role METRICS_MONITOR = valueOf("METRICS_MONITOR");
+  public static final Role AMS_SERVICE_CHECK = valueOf("AMBARI_METRICS_SERVICE_CHECK");
 
   private String name = null;
   
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
index 06eaab3990..4c47a1cf90 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
@@ -55,7 +55,6 @@ import org.apache.ambari.server.state.State;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.InetAddress;
 import java.util.Collections;
 import java.util.EnumMap;
 import java.util.HashMap;
@@ -85,7 +84,7 @@ public abstract class AbstractProviderModule implements ProviderModule,
   private static final String HOST_COMPONENT_HOST_NAME_PROPERTY_ID      = PropertyHelper.getPropertyId("HostRoles", "host_name");
   private static final String HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("HostRoles", "component_name");
   private static final String GANGLIA_SERVER                            = "GANGLIA_SERVER";
-  private static final String METRIC_SERVER                             = "METRIC_COLLECTOR";
+  private static final String METRIC_SERVER                             = "METRICS_COLLECTOR";
   private static final String PROPERTIES_CATEGORY = "properties";
   private static final Map<Service.Type, String> serviceConfigVersions = new ConcurrentHashMap<Service.Type, String>();
   private static final Map<Service.Type, String> serviceConfigTypes = new EnumMap<Service.Type, String>(Service.Type.class);
@@ -105,7 +104,7 @@ public abstract class AbstractProviderModule implements ProviderModule,
     serviceConfigTypes.put(Service.Type.HBASE, "hbase-site");
     serviceConfigTypes.put(Service.Type.YARN, "yarn-site");
     serviceConfigTypes.put(Service.Type.MAPREDUCE2, "mapred-site");
-    serviceConfigTypes.put(Service.Type.AMS, "ams-site");
+    serviceConfigTypes.put(Service.Type.AMBARI_METRICS, "ams-site");
 
     componentServiceMap.put("NAMENODE", Service.Type.HDFS);
     componentServiceMap.put("DATANODE", Service.Type.HDFS);
@@ -335,20 +334,20 @@ public abstract class AbstractProviderModule implements ProviderModule,
       return "80"; // Not called by the provider
     } else if (service.equals(TIMELINE_METRICS)) {
       try {
-        String configType = serviceConfigTypes.get(Service.Type.AMS);
+        String configType = serviceConfigTypes.get(Service.Type.AMBARI_METRICS);
         String currentConfigVersion = getDesiredConfigVersion(clusterName, configType);
-        String oldConfigVersion = serviceConfigVersions.get(Service.Type.AMS);
+        String oldConfigVersion = serviceConfigVersions.get(Service.Type.AMBARI_METRICS);
 
         if (!currentConfigVersion.equals(oldConfigVersion)) {
-          serviceConfigVersions.put(Service.Type.AMS, currentConfigVersion);
+          serviceConfigVersions.put(Service.Type.AMBARI_METRICS, currentConfigVersion);
 
           Map<String, String> configProperties = getDesiredConfigMap
             (clusterName, currentConfigVersion, configType,
-              Collections.singletonMap("METRIC_COLLECTOR",
+              Collections.singletonMap("METRICS_COLLECTOR",
                 new String[] { "timeline.metrics.service.webapp.address" }));
 
           if (!configProperties.isEmpty()) {
-            clusterMetricServerPort = getPortString(configProperties.get("METRIC_COLLECTOR"));
+            clusterMetricServerPort = getPortString(configProperties.get("METRICS_COLLECTOR"));
           } else {
             clusterMetricServerPort = COLLECTOR_DEFAULT_PORT;
           }
@@ -399,8 +398,8 @@ public abstract class AbstractProviderModule implements ProviderModule,
       return isHostComponentLive(clusterName, collectorHostName, "GANGLIA",
         Role.GANGLIA_SERVER.name());
     } else if (service.equals(TIMELINE_METRICS)) {
-      return isHostComponentLive(clusterName, collectorHostName, "AMS",
-        Role.METRIC_COLLECTOR.name());
+      return isHostComponentLive(clusterName, collectorHostName, "AMBARI_METRICS",
+        Role.METRICS_COLLECTOR.name());
     }
     return false;
   }
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
index 666af326ac..b5664733f7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
@@ -52,7 +52,7 @@ import java.util.regex.Pattern;
 
 import static org.apache.ambari.server.Role.HBASE_MASTER;
 import static org.apache.ambari.server.Role.HBASE_REGIONSERVER;
-import static org.apache.ambari.server.Role.METRIC_COLLECTOR;
+import static org.apache.ambari.server.Role.METRICS_COLLECTOR;
 import static org.apache.ambari.server.controller.metrics.MetricsServiceProvider.MetricsService.TIMELINE_METRICS;
 import static org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
 
@@ -66,7 +66,7 @@ public abstract class AMSPropertyProvider extends MetricsPropertyProvider {
   static {
     TIMELINE_APPID_MAP.put(HBASE_MASTER.name(), "HBASE");
     TIMELINE_APPID_MAP.put(HBASE_REGIONSERVER.name(), "HBASE");
-    TIMELINE_APPID_MAP.put(METRIC_COLLECTOR.name(), "AMS-HBASE");
+    TIMELINE_APPID_MAP.put(METRICS_COLLECTOR.name(), "AMS-HBASE");
 
     mapper = new ObjectMapper();
     AnnotationIntrospector introspector = new JaxbAnnotationIntrospector();
@@ -158,14 +158,14 @@ public abstract class AMSPropertyProvider extends MetricsPropertyProvider {
 
           // Check liveliness of host
           if (!hostProvider.isCollectorHostLive(clusterName, TIMELINE_METRICS)) {
-            LOG.info("METRIC_COLLECTOR host is not live. Skip populating " +
+            LOG.info("METRICS_COLLECTOR host is not live. Skip populating " +
               "resources with metrics.");
             return Collections.emptySet();
           }
 
           // Check liveliness of Collector
           if (!hostProvider.isCollectorComponentLive(clusterName, TIMELINE_METRICS)) {
-            LOG.info("METRIC_COLLECTOR is not live. Skip populating resources" +
+            LOG.info("METRICS_COLLECTOR is not live. Skip populating resources" +
               " with metrics.");
             return Collections.emptySet();
           }
@@ -358,11 +358,11 @@ public abstract class AMSPropertyProvider extends MetricsPropertyProvider {
 
   /**
    * Return a propertyInfoMap for all metrics. Handles special case for
-   * METRIC_COLLECTOR metrics by returning HBase metrics.
+   * METRICS_COLLECTOR metrics by returning HBase metrics.
    */
   @Override
   public Map<String, Map<String, PropertyInfo>> getComponentMetrics() {
-    if (super.getComponentMetrics().containsKey(METRIC_COLLECTOR.name())) {
+    if (super.getComponentMetrics().containsKey(METRICS_COLLECTOR.name())) {
       return super.getComponentMetrics();
     }
 
@@ -380,7 +380,7 @@ public abstract class AMSPropertyProvider extends MetricsPropertyProvider {
       amsMetrics.putAll(metricPropertyIds.get(HBASE_REGIONSERVER.name()));
     }
     if (!amsMetrics.isEmpty()) {
-      super.getComponentMetrics().putAll(Collections.singletonMap(METRIC_COLLECTOR.name(), amsMetrics));
+      super.getComponentMetrics().putAll(Collections.singletonMap(METRICS_COLLECTOR.name(), amsMetrics));
     }
 
     return super.getComponentMetrics();
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java
index 9752398002..febcf75dbc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSReportPropertyProvider.java
@@ -107,14 +107,14 @@ public class AMSReportPropertyProvider extends MetricsReportPropertyProvider {
 
     // Check liveliness of host
     if (!hostProvider.isCollectorHostLive(clusterName, TIMELINE_METRICS)) {
-      LOG.info("METRIC_COLLECTOR host is not live. Skip populating " +
+      LOG.info("METRICS_COLLECTOR host is not live. Skip populating " +
         "resources with metrics.");
       return true;
     }
 
     // Check liveliness of Collector
     if (!hostProvider.isCollectorComponentLive(clusterName, TIMELINE_METRICS)) {
-      LOG.info("METRIC_COLLECTOR is not live. Skip populating resources" +
+      LOG.info("METRICS_COLLECTOR is not live. Skip populating resources" +
         " with metrics.");
       return true;
     }
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index 8e32b921c1..4814b03574 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -108,7 +108,7 @@ public class FinalizeUpgradeAction extends AbstractServerAction {
       boolean atLeastOneHostInInstalledState = false;
 
       // It is important to only iterate over the hosts with a version, as opposed to all hosts, since some hosts
-      // may only have components that do not advertise a version, such as AMS.
+      // may only have components that do not advertise a version, such as AMBARI_METRICS.
       for (HostVersionEntity hostVersion : hostVersions) {
         boolean isStateCorrect = false;
 
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
index 10c105aba7..267b65c386 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ComponentInfo.java
@@ -40,7 +40,7 @@ public class ComponentInfo {
    * For example, Masters will typically advertise the version upon a RESTART.
    * Whereas clients will advertise the version when INSTALLED.
    * Some components do not need to advertise a version because it is either redundant, or they don't have a mechanism
-   * at the moment. For instance, ZKFC has the same version as NameNode, while AMS and KERBEROS do not have a mechanism.
+   * at the moment. For instance, ZKFC has the same version as NameNode, while AMBARI_METRICS and KERBEROS do not have a mechanism.
    */
   @XmlElements(@XmlElement(name = "versionAdvertised"))
   private boolean versionAdvertised = true;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java b/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java
index be5c6d8918..d05f209dcb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/Service.java
@@ -133,6 +133,6 @@ public interface Service {
     FLUME,
     YARN,
     MAPREDUCE2,
-    AMS
+    AMBARI_METRICS
   }
 }
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
index a8e782ed58..765167e220 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
@@ -1256,7 +1256,7 @@ public class ClusterImpl implements Cluster {
         for (HostComponentStateEntity hostComponentStateEntity : allHostComponents) {
           if (hostComponentStateEntity.getVersion().equalsIgnoreCase(
               State.UNKNOWN.toString())) {
-            // Some Components cannot advertise a version. E.g., ZKF, AMS,
+            // Some Components cannot advertise a version. E.g., ZKF, AMBARI_METRICS,
             // Kerberos
             ComponentInfo compInfo = ambariMetaInfo.getComponent(
                 stackId.getStackName(), stackId.getStackVersion(),
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostSummary.java b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostSummary.java
index 1676b35860..ef14f0bbdd 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostSummary.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostSummary.java
@@ -52,7 +52,7 @@ public class ServiceComponentHostSummary  {
       if (!hostComponentStateEntity.getVersion().equalsIgnoreCase(State.UNKNOWN.toString())) {
         versionedHostComponents.add(hostComponentStateEntity);
       } else {
-        // Some Components cannot advertise a version. E.g., ZKF, AMS, Kerberos
+        // Some Components cannot advertise a version. E.g., ZKF, AMBARI_METRICS, Kerberos
         ComponentInfo compInfo = ambariMetaInfo.getComponent(
             stackName, stackVersion, hostComponentStateEntity.getServiceName(),
             hostComponentStateEntity.getComponentName());
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/alerts.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/alerts.json
index ad22f595c5..86276bd40a 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/alerts.json
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/alerts.json
@@ -1,16 +1,16 @@
 {
-  "AMS": {
+  "AMBARI_METRICS": {
     "service": [
       {
-        "name": "ams_metric_monitor_process_percent",
-        "label": "Percent Metric Monitors Available",
-        "description": "This alert is triggered if a percentage of Metric Monitor processes are not up and listening on the network for the configured warning and critical thresholds.",
+        "name": "metrics_monitor_process_percent",
+        "label": "Percent Metrics Monitors Available",
+        "description": "This alert is triggered if a percentage of Metrics Monitor processes are not up and listening on the network for the configured warning and critical thresholds.",
         "interval": 1,
         "scope": "SERVICE",
         "enabled": true,
         "source": {
           "type": "AGGREGATE",
-          "alert_name": "ams_metric_monitor_process",
+          "alert_name": "ams_metrics_monitor_process",
           "reporting": {
             "ok": {
               "text": "affected: [{1}], total: [{0}]"
@@ -27,11 +27,11 @@
         }
       }
     ],
-    "METRIC_COLLECTOR": [
+    "METRICS_COLLECTOR": [
       {
-        "name": "ams_metric_collector_process",
-        "label": "Metric Collector Process",
-        "description": "This alert is triggered if the Metric Collector cannot be confirmed to be up and listening on the configured port for number of seconds equal to threshold.",
+        "name": "ams_metrics_collector_process",
+        "label": "Metrics Collector Process",
+        "description": "This alert is triggered if the Metrics Collector cannot be confirmed to be up and listening on the configured port for number of seconds equal to threshold.",
         "interval": 1,
         "scope": "ANY",
         "enabled": true,
@@ -55,9 +55,9 @@
         }
       },
       {
-        "name": "ams_metric_collector_hbase_master_process",
-        "label": "Metric Collector - HBase Master Process",
-        "description": "This alert is triggered if the Metric Collector's HBase master processes cannot be confirmed to be up and listening on the network for the configured critical threshold, given in seconds.",
+        "name": "ams_metrics_collector_hbase_master_process",
+        "label": "Metrics Collector - HBase Master Process",
+        "description": "This alert is triggered if the Metrics Collector's HBase master processes cannot be confirmed to be up and listening on the network for the configured critical threshold, given in seconds.",
         "interval": 1,
         "scope": "ANY",
         "source": {
@@ -80,9 +80,9 @@
         }
       },
       {
-        "name": "ams_metric_collector_hbase_master_cpu",
-        "label": "Metric Collector HBase Maser CPU Utilization",
-        "description": "This host-level alert is triggered if CPU utilization of the Metric Collector's HBase Master exceeds certain warning and critical thresholds. It checks the HBase Master JMX Servlet for the SystemCPULoad property. The threshold values are in percent.",
+        "name": "ams_metrics_collector_hbase_master_cpu",
+        "label": "Metrics Collector HBase Maser CPU Utilization",
+        "description": "This host-level alert is triggered if CPU utilization of the Metrics Collector's HBase Master exceeds certain warning and critical thresholds. It checks the HBase Master JMX Servlet for the SystemCPULoad property. The threshold values are in percent.",
         "interval": 5,
         "scope": "ANY",
         "enabled": true,
@@ -119,9 +119,9 @@
         }
       },
       {
-        "name": "ams_metric_collector_zookeeper_server_process",
-        "label": "Metric Collector - ZooKeeper Server Process",
-        "description": "This host-level alert is triggered if the Metric Collector's ZooKeeper server process cannot be determined to be up and listening on the network.",
+        "name": "ams_metrics_collector_zookeeper_server_process",
+        "label": "Metrics Collector - ZooKeeper Server Process",
+        "description": "This host-level alert is triggered if the Metrics Collector's ZooKeeper server process cannot be determined to be up and listening on the network.",
         "interval": 1,
         "scope": "ANY",
         "source": {
@@ -144,16 +144,16 @@
         }
       }
     ],
-    "METRIC_MONITOR": [
+    "METRICS_MONITOR": [
       {
-        "name": "ams_metric_monitor_process",
-        "label": "Metric Monitor Status",
-        "description": "This alert indicates the status of the Metric Monitor process as determined by the monitor status script.",
+        "name": "ams_metrics_monitor_process",
+        "label": "Metrics Monitor Status",
+        "description": "This alert indicates the status of the Metrics Monitor process as determined by the monitor status script.",
         "interval": 1,
         "scope": "ANY",
         "source": {
           "type": "SCRIPT",
-          "path": "AMS/0.1.0/package/alerts/alert_ambari_metrics_monitor.py"
+          "path": "AMBARI_METRICS/0.1.0/package/alerts/alert_ambari_metrics_monitor.py"
         }
       }
     ]
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
index 2945de150d..a294b0fae1 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-env.xml
@@ -20,28 +20,28 @@
 
 <configuration>
   <property>
-    <name>ams_user</name>
+    <name>ambari_metrics_user</name>
     <value>ams</value>
     <property-type>USER</property-type>
-    <description>AMS User Name.</description>
+    <description>Ambari Metrics User Name.</description>
   </property>
   <property>
-    <name>ams_collector_log_dir</name>
+    <name>metrics_collector_log_dir</name>
     <value>/var/log/ambari-metrics-collector</value>
     <description>Collector log directory.</description>
   </property>
   <property>
-    <name>ams_collector_pid_dir</name>
+    <name>metrics_collector_pid_dir</name>
     <value>/var/run/ambari-metrics-collector</value>
     <description>Collector pid directory.</description>
   </property>
   <property>
-    <name>ams_monitor_pid_dir</name>
+    <name>metrics_monitor_pid_dir</name>
     <value>/var/run/ambari-metrics-monitor</value>
     <description>Monitor pid directory.</description>
   </property>
   <property>
-    <name>ams_monitor_log_dir</name>
+    <name>metrics_monitor_log_dir</name>
     <value>/var/log/ambari-metrics-monitor</value>
     <description>Monitor log directory.</description>
   </property>
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
index 38220b1a0d..93fa2365e2 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-env.xml
@@ -127,10 +127,8 @@ export HBASE_ZOOKEEPER_OPTS="$HBASE_ZOOKEEPER_OPTS -Djava.security.auth.login.co
 _HADOOP_NATIVE_LIB="/usr/lib/ams-hbase/lib/hadoop-native/"
 export HBASE_OPTS="$HBASE_OPTS -Djava.library.path=${_HADOOP_NATIVE_LIB}"
 
-{% if disable_hadoop_environment %}
-# Unset HADOOP_HOME to avoid importing HADOOP installed cluster related configs like: /usr/hdp/2.2.0.0-2041/hadoop/conf/
+#"Unsetting" HADOOP_HOME to avoid importing HADOOP installed cluster related configs like: /usr/hdp/2.2.0.0-2041/hadoop/conf/ 
 export HADOOP_HOME=`pwd`
-{% endif %}
     </value>
   </property>
 
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-log4j.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml
index 47ea220b7a..47ea220b7a 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-log4j.xml
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-policy.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml
index febbd44af1..febbd44af1 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-policy.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-policy.xml
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-security-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml
index 281a8d1faf..35d395f125 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-security-site.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml
@@ -74,4 +74,4 @@
   <property>
     <name>zookeeper.znode.parent</name>
   </property>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml
index b8c96ca37c..6d0c45b7bf 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-hbase-site.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-site.xml
@@ -25,8 +25,8 @@
     <name>hbase.rootdir</name>
     <value>file:///var/lib/ambari-metrics-collector/hbase</value>
     <description>
-      AMS service uses HBase as default storage backend. Set the rootdir for
-      HBase to either local filesystem path if using AMS in embedded mode or
+      Ambari Metrics service uses HBase as default storage backend. Set the rootdir for
+      HBase to either local filesystem path if using Ambari Metrics in embedded mode or
       to a HDFS dir, example: hdfs://namenode.example.org:9000/hbase.
     </description>
   </property>
@@ -48,7 +48,7 @@
   </property>
   <property>
     <name>hbase.cluster.distributed</name>
-    <value>{{hbase_cluster_distributed}}</value>
+    <value>false</value>
     <description>
       The mode the cluster will be in. Possible values are false for
       standalone mode and true for distributed mode. If false, startup will run
@@ -64,7 +64,7 @@
   </property>
   <property>
     <name>hbase.zookeeper.quorum</name>
-    <value>{{zookeeper_quorum_hosts}}</value>
+    <value>localhost</value>
     <description>Comma separated list of servers in the ZooKeeper Quorum.
       For example, "host1.mydomain.com,host2.mydomain.com,host3.mydomain.com".
       By default this is set to localhost for local and pseudo-distributed modes
@@ -269,4 +269,4 @@
       Controls the number of pre-allocated regions for SYSTEM.SEQUENCE table.
     </description>
   </property>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-log4j.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml
index 72ca9674d7..72ca9674d7 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-log4j.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-log4j.xml
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
index 59e5cbb15e..59e5cbb15e 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-site.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/kerberos.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/kerberos.json
index 7b92469891..85011e983a 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/kerberos.json
@@ -1,7 +1,7 @@
 {
   "services": [
     {
-      "name": "AMS",
+      "name": "AMBARI_METRICS",
       "identities": [
         {
           "name": "/spnego"
@@ -12,7 +12,7 @@
       ],
       "components": [
         {
-          "name": "METRIC_COLLECTOR",
+          "name": "METRICS_COLLECTOR",
           "identities": [
             {
               "name": "ams_hbase_master_hbase",
@@ -119,4 +119,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/metainfo.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
index 27b3376735..b1dae96797 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/metainfo.xml
@@ -19,17 +19,15 @@
   <schemaVersion>2.0</schemaVersion>
   <services>
     <service>
-      <name>AMS</name>
-      <displayName>AMS</displayName>
+      <name>AMBARI_METRICS</name>
+      <displayName>Ambari Metrics</displayName>
       <version>0.1.0</version>
-      <comment>Ambari Metrics Service - Monitoring service that provides
-        storage and retrieval capability for metrics collected from services
-        &amp; hosts.
+      <comment>A system for metrics collection that provides storage and retrieval capability for metrics collected from the cluster
       </comment>
       <components>
         <component>
-          <name>METRIC_COLLECTOR</name>
-          <displayName>Metric Collector</displayName>
+          <name>METRICS_COLLECTOR</name>
+          <displayName>Metrics Collector</displayName>
           <category>MASTER</category>
           <cardinality>1</cardinality>
           <versionAdvertised>false</versionAdvertised>
@@ -43,14 +41,14 @@
             </dependency>
           </dependencies>
           <commandScript>
-            <script>scripts/metric_collector.py</script>
+            <script>scripts/metrics_collector.py</script>
             <scriptType>PYTHON</scriptType>
             <timeout>1200</timeout>
           </commandScript>
         </component>
         <component>
-          <name>METRIC_MONITOR</name>
-          <displayName>Metric Monitor</displayName>
+          <name>METRICS_MONITOR</name>
+          <displayName>Metrics Monitor</displayName>
           <category>SLAVE</category>
           <cardinality>ALL</cardinality>
           <versionAdvertised>false</versionAdvertised>
@@ -58,7 +56,7 @@
             <enabled>true</enabled>
           </auto-deploy>
           <commandScript>
-            <script>scripts/metric_monitor.py</script>
+            <script>scripts/metrics_monitor.py</script>
             <scriptType>PYTHON</scriptType>
             <timeout>1200</timeout>
           </commandScript>
@@ -78,9 +76,6 @@
             <package>
               <name>ambari-metrics-hadoop-sink</name>
             </package>
-            <package>
-              <name>gcc</name>
-            </package>
           </packages>
         </osSpecific>
         <osSpecific>
@@ -89,9 +84,6 @@
             <package>
               <name>ambari-metrics-assembly</name>
             </package>
-            <package>
-              <name>gcc</name>
-            </package>
           </packages>
         </osSpecific>
         <osSpecific>
@@ -125,7 +117,6 @@
         <config-type>ams-log4j</config-type>
         <config-type>ams-hbase-policy</config-type>
         <config-type>ams-hbase-site</config-type>
-        <config-type>ams-hbase-security-site</config-type>
         <config-type>ams-hbase-env</config-type>
         <config-type>ams-hbase-log4j</config-type>
       </configuration-dependencies>
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/alerts/alert_ambari_metrics_monitor.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/alerts/alert_ambari_metrics_monitor.py
index a9eb6fa9b2..7e8a463c7d 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/alerts/alert_ambari_metrics_monitor.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/alerts/alert_ambari_metrics_monitor.py
@@ -21,8 +21,6 @@ limitations under the License.
 import os
 import socket
 
-from ambari_commons import OSConst
-from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
 from resource_management.libraries.functions.check_process_status import check_process_status
 from resource_management.core.exceptions import ComponentIsNotRunning
 
@@ -40,17 +38,9 @@ def get_tokens():
   return (AMS_MONITOR_PID_DIR,)
 
 
-@OsFamilyFuncImpl(OSConst.WINSRV_FAMILY)
-def is_monitor_process_live(pid_file):
-  from ambari_commons.os_windows import WinServiceController, SERVICE_STATUS_RUNNING
-
-  svcStatus = WinServiceController.QueryStatus("AmbariMetricsHostMonitoring")
-  return (SERVICE_STATUS_RUNNING == svcStatus)
-
-@OsFamilyFuncImpl(OsFamilyImpl.DEFAULT)
 def is_monitor_process_live(pid_file):
   """
-  Gets whether the AMS monitor represented by the specified file is running.
+  Gets whether the Metrics Monitor represented by the specified file is running.
   :param pid_file: the PID file of the monitor to check
   :return: True if the monitor is running, False otherwise
   """
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/files/hbaseSmokeVerify.sh b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/hbaseSmokeVerify.sh
index 5c320c0c78..5c320c0c78 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/files/hbaseSmokeVerify.sh
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/files/hbaseSmokeVerify.sh
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/__init__.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/__init__.py
index 5561e1087b..5561e1087b 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/__init__.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/__init__.py
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/ams.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
index 7d46753a46..20c4223603 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/ams.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
@@ -18,7 +18,6 @@ limitations under the License.
 
 """
 
-import os
 from resource_management import *
 from ambari_commons import OSConst
 from service_mapping import *
@@ -50,14 +49,9 @@ def ams(name=None):
               owner=params.ams_user,
     )
 
-    merged_ams_hbase_site = {}
-    merged_ams_hbase_site.update(params.config['configurations']['ams-hbase-site'])
-    if params.security_enabled:
-      merged_ams_hbase_site.update(params.config['configurations']['ams-hbase-security-site'])
-
     XmlConfig( "hbase-site.xml",
                conf_dir = params.ams_collector_conf_dir,
-               configurations = merged_ams_hbase_site,
+               configurations = params.config['configurations']['ams-hbase-site'],
                configuration_attributes=params.config['configuration_attributes']['ams-hbase-site'],
                owner = params.ams_user,
     )
@@ -136,24 +130,14 @@ def ams(name=None):
               group=params.user_group
     )
 
-    merged_ams_hbase_site = {}
-    merged_ams_hbase_site.update(params.config['configurations']['ams-hbase-site'])
-    if params.security_enabled:
-      merged_ams_hbase_site.update(params.config['configurations']['ams-hbase-security-site'])
-
     XmlConfig( "hbase-site.xml",
                conf_dir = params.ams_collector_conf_dir,
-               configurations = merged_ams_hbase_site,
+               configurations = params.config['configurations']['ams-hbase-site'],
                configuration_attributes=params.config['configuration_attributes']['ams-hbase-site'],
                owner = params.ams_user,
                group = params.user_group
     )
 
-    if params.security_enabled:
-      TemplateConfig(os.path.join(params.hbase_conf_dir, "ams_collector_jaas.conf"),
-                     owner = params.ams_user,
-                     template_tag = None)
-
     if (params.log4j_props != None):
       File(format("{params.ams_collector_conf_dir}/log4j.properties"),
            mode=0644,
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/ams_service.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py
index 926068365a..926068365a 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/ams_service.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams_service.py
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/functions.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/functions.py
index a5107d6332..a5107d6332 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/functions.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/functions.py
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/hbase.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
index b3bca89275..0ccddde643 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/hbase.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase.py
@@ -114,14 +114,9 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
              recursive = True
   )
 
-  merged_ams_hbase_site = {}
-  merged_ams_hbase_site.update(params.config['configurations']['ams-hbase-site'])
-  if params.security_enabled:
-    merged_ams_hbase_site.update(params.config['configurations']['ams-hbase-security-site'])
-
   XmlConfig("hbase-site.xml",
             conf_dir = params.hbase_conf_dir,
-            configurations = merged_ams_hbase_site,
+            configurations = params.config['configurations']['ams-hbase-site'],
             configuration_attributes=params.config['configuration_attributes']['ams-hbase-site'],
             owner = params.hbase_user,
             group = params.user_group
@@ -162,9 +157,7 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
 
   if params.security_enabled:
     hbase_TemplateConfig( format("hbase_{name}_jaas.conf"), user=params.hbase_user)
-    hbase_TemplateConfig( format("hbase_client_jaas.conf"), user=params.hbase_user)
-    hbase_TemplateConfig( format("ams_zookeeper_jaas.conf"), user=params.hbase_user)
-
+  
   if name in ["master","regionserver"]:
 
     if params.is_hbase_distributed:
@@ -174,13 +167,6 @@ def hbase(name=None # 'master' or 'regionserver' or 'client'
                            owner=params.hbase_user,
                            mode=0775
       )
-
-      params.HdfsDirectory(params.hbase_staging_dir,
-                           action="create_delayed",
-                           owner=params.hbase_user,
-                           mode=0711
-      )
-
       params.HdfsDirectory(None, action="create")
 
     else:
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/hbase_master.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_master.py
index a26254da20..a26254da20 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/hbase_master.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_master.py
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/hbase_regionserver.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_regionserver.py
index 8d66dcca04..8d66dcca04 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/hbase_regionserver.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_regionserver.py
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/hbase_service.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_service.py
index 180755f7d0..180755f7d0 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/hbase_service.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/hbase_service.py
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
new file mode 100644
index 0000000000..addfc3331d
--- /dev/null
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_collector.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+"""
+
+from resource_management import *
+from ams import ams
+from ams_service import ams_service
+from hbase import hbase
+from status import check_service_status
+
+class AmsCollector(Script):
+  def install(self, env):
+    self.install_packages(env)
+    self.configure(env) # for security
+
+
+  def configure(self, env):
+    import params
+    env.set_params(params)
+    hbase('master')
+    hbase('regionserver')
+    ams(name='collector')
+
+  def start(self, env):
+    self.configure(env) # for security
+
+    ams_service( 'collector',
+                   action = 'start'
+    )
+
+  def stop(self, env):
+    import params
+    env.set_params(params)
+
+    ams_service( 'collector', action = 'stop')
+
+  def status(self, env):
+    import status_params
+    env.set_params(status_params)
+    check_service_status(name='collector')
+
+
+if __name__ == "__main__":
+  AmsCollector().execute()
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/metric_monitor.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
index f6cce8f742..f6cce8f742 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/metric_monitor.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_monitor.py
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
index eb064f54eb..59ec7f9ee1 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py
@@ -31,20 +31,20 @@ else:
 config = Script.get_config()
 exec_tmp_dir = Script.get_tmp_dir()
 
-#AMS data
+#AMBARI_METRICS data
 ams_pid_dir = status_params.ams_collector_pid_dir
 
 ams_collector_script = "/usr/sbin/ambari-metrics-collector"
 ams_collector_pid_dir = status_params.ams_collector_pid_dir
-ams_collector_hosts = default("/clusterHostInfo/metric_collector_hosts", [])
+ams_collector_hosts = default("/clusterHostInfo/metrics_collector_hosts", [])
 ams_collector_host_single = ams_collector_hosts[0] #TODO cardinality is 1+ so we can have more than one host
 metric_collector_port = default("/configurations/ams-site/timeline.metrics.service.webapp.address", "0.0.0.0:6188")
 if metric_collector_port and metric_collector_port.find(':') != -1:
   metric_collector_port = metric_collector_port.split(':')[1]
 pass
 
-ams_collector_log_dir = config['configurations']['ams-env']['ams_collector_log_dir']
-ams_monitor_log_dir = config['configurations']['ams-env']['ams_monitor_log_dir']
+ams_collector_log_dir = config['configurations']['ams-env']['metrics_collector_log_dir']
+ams_monitor_log_dir = config['configurations']['ams-env']['metrics_monitor_log_dir']
 
 ams_monitor_dir = "/usr/lib/python2.6/site-packages/resource_monitoring"
 ams_monitor_pid_dir = status_params.ams_monitor_pid_dir
@@ -65,9 +65,7 @@ hbase_root_dir = config['configurations']['ams-hbase-site']['hbase.rootdir']
 is_hbase_distributed = hbase_root_dir.startswith('hdfs://')
 
 # security is disabled for embedded mode, when HBase is backed by file
-security_enabled = False if not is_hbase_distributed else config['configurations']['cluster-env']['security_enabled']
-# if cluster is secured and embedded we have to disable haddop env
-disable_hadoop_environment = config['configurations']['cluster-env']['security_enabled'] and not is_hbase_distributed
+security_enabled = False if not is_hbase_distributed else config['configurations']['cluster-env']['security_enabled'] 
 
 # this is "hadoop-metrics.properties" for 1.x stacks
 metric_prop_file_name = "hadoop-metrics2-hbase.properties"
@@ -85,9 +83,6 @@ regionserver_xmn_size = calc_xmn_from_xms(regionserver_heapsize, regionserver_xm
 # For embedded mode
 hbase_heapsize = master_heapsize
 
-zookeeper_quorum_hosts = ','.join(ams_collector_hosts) if is_hbase_distributed else 'localhost'
-hbase_cluster_distributed = 'true' if is_hbase_distributed else 'false'
-
 ams_checkpoint_dir = config['configurations']['ams-site']['timeline.metrics.aggregator.checkpoint.dir']
 hbase_pid_dir = status_params.hbase_pid_dir
 hbase_tmp_dir = config['configurations']['ams-hbase-site']['hbase.tmp.dir']
@@ -107,30 +102,21 @@ service_check_data = functions.get_unique_id_and_date()
 user_group = config['configurations']['cluster-env']["user_group"]
 hadoop_user = "hadoop"
 
-kinit_cmd = ""
-
 if security_enabled:
   _hostname_lowercase = config['hostname'].lower()
+  master_jaas_princ = default('/configurations/ams-hbase-site/hbase.master.kerberos.principal', 'hbase/_HOST@EXAMPLE.COM').replace('_HOST',_hostname_lowercase)
+  regionserver_jaas_princ = default('/configurations/ams-hbase-site/hbase.regionserver.kerberos.principal', 'hbase/_HOST@EXAMPLE.COM').replace('_HOST',_hostname_lowercase)
 
-  client_jaas_config_file = format("{hbase_conf_dir}/hbase_client_jaas.conf")
+  master_keytab_path = config['configurations']['ams-hbase-site']['hbase.master.keytab.file']
+  regionserver_keytab_path = config['configurations']['ams-hbase-site']['hbase.regionserver.keytab.file']
   smoke_user_keytab = config['configurations']['cluster-env']['smokeuser_keytab']
   hbase_user_keytab = config['configurations']['ams-hbase-env']['hbase_user_keytab']
+  kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
 
-  ams_collector_jaas_config_file = format("{hbase_conf_dir}/ams_collector_jaas.conf")
-  ams_collector_keytab_path = config['configurations']['ams-hbase-security-site']['hbase.myclient.keytab']
-  ams_collector_jaas_princ = config['configurations']['ams-hbase-security-site']['hbase.myclient.principal'].replace('_HOST',_hostname_lowercase)
-
-  ams_zookeeper_jaas_config_file = format("{hbase_conf_dir}/ams_zookeeper_jaas.conf")
-  ams_zookeeper_keytab = config['configurations']['ams-hbase-security-site']['ams.zookeeper.keytab']
-  ams_zookeeper_principal_name = config['configurations']['ams-hbase-security-site']['ams.zookeeper.principal'].replace('_HOST',_hostname_lowercase)
-
-  master_jaas_config_file = format("{hbase_conf_dir}/hbase_master_jaas.conf")
-  master_keytab_path = config['configurations']['ams-hbase-security-site']['hbase.master.keytab.file']
-  master_jaas_princ = config['configurations']['ams-hbase-security-site']['hbase.master.kerberos.principal'].replace('_HOST',_hostname_lowercase)
-
-  regionserver_jaas_config_file = format("{hbase_conf_dir}/hbase_regionserver_jaas.conf")
-  regionserver_keytab_path = config['configurations']['ams-hbase-security-site']['hbase.regionserver.keytab.file']
-  regionserver_jaas_princ = config['configurations']['ams-hbase-security-site']['hbase.regionserver.kerberos.principal'].replace('_HOST',_hostname_lowercase)
+if security_enabled:
+   kinit_cmd = format("{kinit_path_local} -kt {hbase_user_keytab} {hbase_user};")
+else:
+   kinit_cmd = ""
 
 #log4j.properties
 if (('ams-hbase-log4j' in config['configurations']) and ('content' in config['configurations']['ams-hbase-log4j'])):
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
index 44d90b7a24..c67f75cb38 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_linux.py
@@ -20,12 +20,12 @@ limitations under the License.
 
 from resource_management import *
 from ambari_commons import OSCheck
-
+import status_params
 config = Script.get_config()
 
 ams_collector_conf_dir = "/etc/ambari-metrics-collector/conf"
 ams_monitor_conf_dir = "/etc/ambari-metrics-monitor/conf/"
-ams_user = config['configurations']['ams-env']['ams_user']
+ams_user = status_params.ams_user
 #RPM versioning support
 rpm_version = default("/configurations/hadoop-env/rpm_version", None)
 
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/params_windows.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_windows.py
index 1b3509e565..1b3509e565 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/params_windows.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params_windows.py
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py
index 46eba891cf..dc5a330cb9 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_check.py
@@ -51,20 +51,20 @@ class AMSServiceCheck(Script):
 
     #Just check that the services were correctly installed
     #Check the monitor on all hosts
-    Logger.info("AMS Monitor service check was started.")
+    Logger.info("Metrics Monitor service check was started.")
     if not check_windows_service_exists(monitor_win_service_name):
-      raise Fail("AMS Monitor service was not properly installed. Check the logs and retry the installation.")
+      raise Fail("Metrics Monitor service was not properly installed. Check the logs and retry the installation.")
     #Check the collector only where installed
     if params.ams_collector_home_dir and os.path.isdir(params.ams_collector_home_dir):
-      Logger.info("AMS Collector service check was started.")
+      Logger.info("Metrics Collector service check was started.")
       if not check_windows_service_exists(collector_win_service_name):
-        raise Fail("AMS Collector service was not properly installed. Check the logs and retry the installation.")
+        raise Fail("Metrics Collector service was not properly installed. Check the logs and retry the installation.")
 
   @OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT)
   def service_check(self, env):
     import params
 
-    Logger.info("AMS service check was started.")
+    Logger.info("Ambari Metrics service check was started.")
     env.set_params(params)
 
     random_value1 = random.random()
@@ -90,7 +90,7 @@ class AMSServiceCheck(Script):
                     % (self.AMS_CONNECT_TIMEOUT))
 
     if i == self.AMS_CONNECT_TRIES:
-      raise Fail("AMS metrics were not saved. Service check has failed. "
+      raise Fail("Metrics were not saved. Service check has failed. "
            "\nConnection failed.")
 
     response = conn.getresponse()
@@ -101,14 +101,14 @@ class AMSServiceCheck(Script):
     conn.close()
 
     if response.status == 200:
-      Logger.info("AMS metrics were saved.")
+      Logger.info("Metrics were saved.")
     else:
-      Logger.info("AMS metrics were not saved. Service check has failed.")
-      raise Fail("AMS metrics were not saved. Service check has failed. POST request status: %s %s \n%s" %
+      Logger.info("Metrics were not saved. Service check has failed.")
+      raise Fail("Metrics were not saved. Service check has failed. POST request status: %s %s \n%s" %
                  (response.status, response.reason, data))
 
     get_metrics_parameters = {
-      "metricNames": "AMS.SmokeTest.FakeMetric",
+      "metricNames": "AMBARI_METRICS.SmokeTest.FakeMetric",
       "appId": "amssmoketestfake",
       "hostname": params.hostname,
       "startTime": 1419860000000,
@@ -132,10 +132,10 @@ class AMSServiceCheck(Script):
     conn.close()
 
     if response.status == 200:
-      Logger.info("AMS metrics were retrieved.")
+      Logger.info("Metrics were retrieved.")
     else:
-      Logger.info("AMS metrics were not retrieved. Service check has failed.")
-      raise Fail("AMS metrics were not retrieved. Service check has failed. GET request status: %s %s \n%s" %
+      Logger.info("Metrics were not retrieved. Service check has failed.")
+      raise Fail("Metrics were not retrieved. Service check has failed. GET request status: %s %s \n%s" %
                  (response.status, response.reason, data))
     data_json = json.loads(data)
 
@@ -152,7 +152,7 @@ class AMSServiceCheck(Script):
       Logger.info("Values %s and %s were not found in response." % (random_value1, current_time))
       raise Fail("Values %s and %s were not found in response." % (random_value1, current_time))
 
-    Logger.info("AMS service check is finished.")
+    Logger.info("Ambari Metrics service check is finished.")
 
 if __name__ == "__main__":
   AMSServiceCheck().execute()
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/service_mapping.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_mapping.py
index 6a96c2824c..6a96c2824c 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/service_mapping.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/service_mapping.py
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/status.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status.py
index 91f13d42f2..91f13d42f2 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/status.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status.py
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status_params.py
index 947c9922f9..51d0feb9ff 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/status_params.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/status_params.py
@@ -20,20 +20,11 @@ limitations under the License.
 
 from resource_management import *
 
-from ambari_commons import OSCheck
-if OSCheck.is_windows_family():
-    from params_windows import *
-else:
-    from params_linux import *
+config = Script.get_config()
 
 hbase_pid_dir = config['configurations']['ams-hbase-env']['hbase_pid_dir']
+ams_user = config['configurations']['ams-env']['ambari_metrics_user']
 hbase_user = ams_user
-ams_collector_pid_dir = config['configurations']['ams-env']['ams_collector_pid_dir']
-ams_monitor_pid_dir = config['configurations']['ams-env']['ams_monitor_pid_dir']
+ams_collector_pid_dir = config['configurations']['ams-env']['metrics_collector_pid_dir']
+ams_monitor_pid_dir = config['configurations']['ams-env']['metrics_monitor_pid_dir']
 
-security_enabled = config['configurations']['cluster-env']['security_enabled']
-ams_hbase_conf_dir = format("{hbase_conf_dir}")
-
-kinit_path_local = functions.get_kinit_path(["/usr/bin", "/usr/kerberos/bin", "/usr/sbin"])
-hostname = config['hostname']
-tmp_dir = Script.get_tmp_dir()
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/ams_collector_jaas.conf.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/ams_collector_jaas.conf.j2
index 9ce7cd78f9..f7f00ebe06 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/ams_collector_jaas.conf.j2
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/ams_collector_jaas.conf.j2
@@ -23,4 +23,4 @@ storeKey=true
 useTicketCache=false
 keyTab="{{ams_collector_keytab_path}}"
 principal="{{ams_collector_jaas_princ}}";
-};
\ No newline at end of file
+};
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/ams_zookeeper_jaas.conf.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/ams_zookeeper_jaas.conf.j2
index f1750b9f58..19295489fe 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/ams_zookeeper_jaas.conf.j2
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/ams_zookeeper_jaas.conf.j2
@@ -23,4 +23,4 @@ storeKey=true
 useTicketCache=false
 keyTab="{{ams_zookeeper_keytab}}"
 principal="{{ams_zookeeper_principal_name}}";
-};
\ No newline at end of file
+};
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
index 4472abc796..5a4dd16a77 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hadoop-metrics2-hbase.properties.j2
@@ -59,4 +59,4 @@ hbase.sink.timeline.serviceName-prefix=ams
 
 # Switch off metrics generation on a per region basis
 *.source.filter.class=org.apache.hadoop.metrics2.filter.GlobFilter
-hbase.*.source.filter.exclude=*Regions*
\ No newline at end of file
+hbase.*.source.filter.exclude=*Regions*
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hbase_client_jaas.conf.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hbase_client_jaas.conf.j2
index 38f9721b99..38f9721b99 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hbase_client_jaas.conf.j2
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hbase_client_jaas.conf.j2
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hbase_grant_permissions.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hbase_grant_permissions.j2
index 33789839fc..c29c674596 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hbase_grant_permissions.j2
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hbase_grant_permissions.j2
@@ -36,4 +36,4 @@
 #
 #
 grant '{{smoke_test_user}}', '{{smokeuser_permissions}}'
-exit
\ No newline at end of file
+exit
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hbase_master_jaas.conf.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hbase_master_jaas.conf.j2
index a93c36c4ed..a93c36c4ed 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hbase_master_jaas.conf.j2
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hbase_master_jaas.conf.j2
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hbase_regionserver_jaas.conf.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hbase_regionserver_jaas.conf.j2
index 709748164f..709748164f 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/hbase_regionserver_jaas.conf.j2
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/hbase_regionserver_jaas.conf.j2
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/metric_groups.conf.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metric_groups.conf.j2
index aa03d195c6..aa03d195c6 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/metric_groups.conf.j2
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metric_groups.conf.j2
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/metric_monitor.ini.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metric_monitor.ini.j2
index 2ee21d4c82..2ee21d4c82 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/metric_monitor.ini.j2
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/metric_monitor.ini.j2
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/regionservers.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/regionservers.j2
index fc6cc37b83..81d060b16e 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/regionservers.j2
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/regionservers.j2
@@ -17,4 +17,4 @@
 #}
 
 {% for host in rs_hosts %}{{host}}
-{% endfor %}
\ No newline at end of file
+{% endfor %}
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/smoketest_metrics.json.j2 b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/smoketest_metrics.json.j2
index e2e85010cb..c90c29eb29 100644
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/templates/smoketest_metrics.json.j2
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/templates/smoketest_metrics.json.j2
@@ -1,7 +1,7 @@
 {
   "metrics": [
     {
-      "metricname": "AMS.SmokeTest.FakeMetric",
+      "metricname": "AMBARI_METRICS.SmokeTest.FakeMetric",
       "appid": "amssmoketestfake",
       "hostname": "{{hostname}}",
       "timestamp": 1419860001000,
diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/metric_collector.py b/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/metric_collector.py
deleted file mode 100644
index 2a2e181054..0000000000
--- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/package/scripts/metric_collector.py
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/env python
-"""
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-"""
-
-from resource_management import *
-from resource_management.libraries.functions.security_commons import build_expectations, \
-  cached_kinit_executor, get_params_from_filesystem, validate_security_config_properties, \
-  FILE_TYPE_XML
-from ams import ams
-from ams_service import ams_service
-from hbase import hbase
-from status import check_service_status
-
-class AmsCollector(Script):
-  def install(self, env):
-    self.install_packages(env)
-    self.configure(env) # for security
-
-
-  def configure(self, env):
-    import params
-    env.set_params(params)
-    hbase('master')
-    hbase('regionserver')
-    ams(name='collector')
-
-  def start(self, env):
-    self.configure(env) # for security
-
-    ams_service( 'collector',
-                   action = 'start'
-    )
-
-  def stop(self, env):
-    import params
-    env.set_params(params)
-
-    ams_service( 'collector', action = 'stop')
-
-  def status(self, env):
-    import status_params
-    env.set_params(status_params)
-    check_service_status(name='collector')
-
-
-  def security_status(self, env):
-    import status_params
-
-    env.set_params(status_params)
-    props_value_check = {"hbase.security.authentication": "kerberos",
-                         "hbase.security.authorization": "true"}
-
-    props_empty_check = ["hbase.zookeeper.property.authProvider.1",
-                         "hbase.master.keytab.file",
-                         "hbase.master.kerberos.principal",
-                         "hbase.regionserver.keytab.file",
-                         "hbase.regionserver.kerberos.principal"
-    ]
-    props_read_check = ['hbase.master.keytab.file', 'hbase.regionserver.keytab.file']
-    ams_hbase_site_expectations = build_expectations('hbase-site', props_value_check,
-                                                     props_empty_check,
-                                                     props_read_check)
-
-    expectations = {}
-    expectations.update(ams_hbase_site_expectations)
-
-    security_params = get_params_from_filesystem(status_params.ams_hbase_conf_dir,
-                                                 {'hbase-site.xml': FILE_TYPE_XML})
-
-    is_hbase_distributed = security_params['hbase-site']['hbase.rootdir'].startswith('hdfs://')
-    # for embedded mode, when HBase is backed by file, security state is SECURED_KERBEROS by definition when cluster is secured
-    if status_params.security_enabled and not is_hbase_distributed:
-      self.put_structured_out({"securityState": "SECURED_KERBEROS"})
-      return
-
-    result_issues = validate_security_config_properties(security_params, expectations)
-
-    if not result_issues:  # If all validations passed successfully
-      try:
-        # Double check the dict before calling execute
-        if ('hbase-site' not in security_params or
-                'hbase.master.keytab.file' not in security_params['hbase-site'] or
-                'hbase.master.kerberos.principal' not in security_params['hbase-site']):
-          self.put_structured_out({"securityState": "UNSECURED"})
-          self.put_structured_out(
-            {"securityIssuesFound": "Keytab file or principal are not set property."})
-          return
-
-        cached_kinit_executor(status_params.kinit_path_local,
-                              status_params.hbase_user,
-                              security_params['hbase-site']['hbase.master.keytab.file'],
-                              security_params['hbase-site']['hbase.master.kerberos.principal'],
-                              status_params.hostname,
-                              status_params.tmp_dir)
-        self.put_structured_out({"securityState": "SECURED_KERBEROS"})
-      except Exception as e:
-        self.put_structured_out({"securityState": "ERROR"})
-        self.put_structured_out({"securityStateErrorInfo": str(e)})
-    else:
-      issues = []
-      for cf in result_issues:
-        issues.append("Configuration file %s did not pass the validation. Reason: %s" % (
-        cf, result_issues[cf]))
-      self.put_structured_out({"securityIssuesFound": ". ".join(issues)})
-      self.put_structured_out({"securityState": "UNSECURED"})
-
-if __name__ == "__main__":
-  AmsCollector().execute()
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/role_command_order.json b/ambari-server/src/main/resources/stacks/HDP/2.0.6/role_command_order.json
index 0607d9da9b..5e3f32732b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/role_command_order.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/role_command_order.json
@@ -29,8 +29,8 @@
   },
   "_comment" : "Dependencies that are used when GLUSTERFS is not present in cluster",
   "optional_no_glusterfs": {
-    "METRIC_COLLECTOR-START": ["NAMENODE-START", "DATANODE-START"],
-    "AMS_SERVICE_CHECK-SERVICE_CHECK": ["METRIC_COLLECTOR-START", "HDFS_SERVICE_CHECK-SERVICE_CHECK"],
+    "METRICS_COLLECTOR-START": ["NAMENODE-START", "DATANODE-START"],
+    "AMBARI_METRICS_SERVICE_CHECK-SERVICE_CHECK": ["METRICS_COLLECTOR-START", "HDFS_SERVICE_CHECK-SERVICE_CHECK"],
     "SECONDARY_NAMENODE-START": ["NAMENODE-START"],
     "RESOURCEMANAGER-START": ["NAMENODE-START", "DATANODE-START"],
     "NODEMANAGER-START": ["NAMENODE-START", "DATANODE-START", "RESOURCEMANAGER-START"],
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/metainfo.xml
new file mode 100644
index 0000000000..c8aa26e02b
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMBARI_METRICS/metainfo.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<metainfo>
+  <schemaVersion>2.0</schemaVersion>
+  <services>
+    <service>
+      <name>AMBARI_METRICS</name>
+      <extends>common-services/AMBARI_METRICS/0.1.0</extends>
+    </service>
+  </services>
+</metainfo>
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMS/metainfo.xml
deleted file mode 100644
index f0fa469ada..0000000000
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/AMS/metainfo.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<metainfo>
-  <schemaVersion>2.0</schemaVersion>
-  <services>
-    <service>
-      <name>AMS</name>
-      <extends>common-services/AMS/0.1.0</extends>
-    </service>
-  </services>
-</metainfo>
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index 2cdecba4cd..776b1d5c81 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -85,7 +85,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
       "MAPREDUCE2": self.recommendMapReduce2Configurations,
       "HDFS": self.recommendHDFSConfigurations,
       "HBASE": self.recommendHbaseEnvConfigurations,
-      "AMS": self.recommendAmsConfigurations
+      "AMBARI_METRICS": self.recommendAmsConfigurations
     }
 
   def putProperty(self, config, configType):
@@ -131,14 +131,14 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
     putTimelineServiceProperty = self.putProperty(configurations, "ams-site")
     putHbaseEnvProperty = self.putProperty(configurations, "ams-hbase-env")
 
-    amsCollectorHosts = self.getComponentHostNames(services, "AMS", "METRIC_COLLECTOR")
+    amsCollectorHosts = self.getComponentHostNames(services, "AMBARI_METRICS", "METRICS_COLLECTOR")
     putHbaseEnvProperty("hbase_regionserver_heapsize", "1024m")
     putAmsHbaseSiteProperty("hfile.block.cache.size", 0.3)
     putAmsHbaseSiteProperty("hbase.regionserver.global.memstore.upperLimit", 0.5)
     putAmsHbaseSiteProperty("hbase.regionserver.global.memstore.lowerLimit", 0.4)
     putTimelineServiceProperty("timeline.metrics.host.aggregator.ttl", 86400)
 
-    # TODO recommend configuration for multiple AMS collectors
+    # TODO recommend configuration for multiple AMBARI_METRICS collectors
     if len(amsCollectorHosts) > 1:
       pass
     else:
@@ -256,7 +256,7 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
       "MAPREDUCE2": {"mapred-site": self.validateMapReduce2Configurations},
       "YARN": {"yarn-site": self.validateYARNConfigurations},
       "HBASE": {"hbase-env": self.validateHbaseEnvConfigurations},
-      "AMS": {"ams-hbase-site": self.validateAmsHbaseSiteConfigurations,
+      "AMBARI_METRICS": {"ams-hbase-site": self.validateAmsHbaseSiteConfigurations,
               "ams-hbase-env": self.validateAmsHbaseEnvConfigurations,
               "ams-site": self.validateAmsSiteConfigurations},
     }
@@ -275,11 +275,11 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
 
   def validateAmsHbaseSiteConfigurations(self, properties, recommendedDefaults, configurations, services, hosts):
 
-    amsCollectorHosts = self.getComponentHostNames(services, "AMS", "METRIC_COLLECTOR")
+    amsCollectorHosts = self.getComponentHostNames(services, "AMBARI_METRICS", "METRICS_COLLECTOR")
     ams_site = getSiteProperties(configurations, "ams-site")
 
     recommendedDiskSpace = 10485760
-    # TODO validate configuration for multiple AMS collectors
+    # TODO validate configuration for multiple AMBARI_METRICS collectors
     if len(amsCollectorHosts) > 1:
       pass
     else:
@@ -321,17 +321,17 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
     masterItem = self.validatorLessThenDefaultValue(properties, recommendedDefaults, "hbase_master_heapsize")
     ams_env = getSiteProperties(configurations, "ams-env")
     logDirItem = self.validatorEqualsPropertyItem(properties, "hbase_log_dir",
-                                                  ams_env, "ams_collector_log_dir")
+                                                  ams_env, "metrics_collector_log_dir")
 
     if masterItem is None:
       hbase_master_heapsize = formatXmxSizeToBytes(properties["hbase_master_heapsize"])
 
-      # TODO Add AMS Collector Xmx property to ams-env
+      # TODO Add AMBARI_METRICS Collector Xmx property to ams-env
       # Collector 512m + HBASE Master heapsize
       # For standalone HBase, master's heap memory is used by regionserver as well
       requiredMemory = 536870912 + hbase_master_heapsize
 
-      amsCollectorHosts = self.getComponentHostNames(services, "AMS", "METRIC_COLLECTOR")
+      amsCollectorHosts = self.getComponentHostNames(services, "AMBARI_METRICS", "METRICS_COLLECTOR")
       for collectorHostName in amsCollectorHosts:
         for host in hosts["items"]:
           if host["Hosts"]["host_name"] == collectorHostName:
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index 6a5aab58f8..2bdbce713a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -27,7 +27,7 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
       "HBASE": self.recommendHBASEConfigurations,
       "MAPREDUCE2": self.recommendMapReduce2Configurations,
       "TEZ": self.recommendTezConfigurations,
-      "AMS": self.recommendAmsConfigurations,
+      "AMBARI_METRICS": self.recommendAmsConfigurations,
       "YARN": self.recommendYARNConfigurations
     }
     parentRecommendConfDict.update(childRecommendConfDict)
@@ -349,27 +349,27 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
 
   def getMastersWithMultipleInstances(self):
     result = super(HDP22StackAdvisor, self).getMastersWithMultipleInstances()
-    result.extend(['METRIC_COLLECTOR'])
+    result.extend(['METRICS_COLLECTOR'])
     return result
 
   def getNotValuableComponents(self):
     result = super(HDP22StackAdvisor, self).getNotValuableComponents()
-    result.extend(['METRIC_MONITOR'])
+    result.extend(['METRICS_MONITOR'])
     return result
 
   def getNotPreferableOnServerComponents(self):
     result = super(HDP22StackAdvisor, self).getNotPreferableOnServerComponents()
-    result.extend(['METRIC_COLLECTOR'])
+    result.extend(['METRICS_COLLECTOR'])
     return result
 
   def getCardinalitiesDict(self):
     result = super(HDP22StackAdvisor, self).getCardinalitiesDict()
-    result['METRIC_COLLECTOR'] = {"min": 1}
+    result['METRICS_COLLECTOR'] = {"min": 1}
     return result
 
   def getComponentLayoutSchemes(self):
     result = super(HDP22StackAdvisor, self).getComponentLayoutSchemes()
-    result['METRIC_COLLECTOR'] = {"else": 2}
+    result['METRICS_COLLECTOR'] = {"else": 2}
     return result
 
 def is_number(s):
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml
index 3b421b9bd1..3b421b9bd1 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-env.xml
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-hbase-env.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
index ae2aa9a056..ae2aa9a056 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-hbase-env.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-env.xml
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-hbase-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
index 414f73d699..1023413073 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-hbase-site.xml
@@ -25,8 +25,8 @@
     <name>hbase.rootdir</name>
     <value>file:///C:/hadoop/hbase-ams</value>
     <description>
-      AMS service uses HBase as default storage backend. Set the rootdir for
-      HBase to either local filesystem path if using AMS in embedded mode or
+      Ambari Metrics service uses HBase as default storage backend. Set the rootdir for
+      HBase to either local filesystem path if using Ambari Metrics in embedded mode or
       to a HDFS dir, example: hdfs://namenode.example.org:9000/hbase.  By
       default HBase writes into /tmp. Change this configuration else all data
       will be lost on machine restart.
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-log4j.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml
index fcfdc24185..fcfdc24185 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-log4j.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-log4j.xml
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml
index 097de9d80c..097de9d80c 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/configuration/ams-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/configuration/ams-site.xml
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/metainfo.xml
index f0fa469ada..c97ab1eadf 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.1/services/AMBARI_METRICS/metainfo.xml
@@ -19,8 +19,8 @@
   <schemaVersion>2.0</schemaVersion>
   <services>
     <service>
-      <name>AMS</name>
-      <extends>common-services/AMS/0.1.0</extends>
+      <name>AMBARI_METRICS</name>
+      <extends>common-services/AMBARI_METRICS/0.1.0</extends>
     </service>
   </services>
 </metainfo>
diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/AMS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/AMBARI_METRICS/metainfo.xml
index c57f6bee59..142cf67669 100644
--- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/AMS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/AMBARI_METRICS/metainfo.xml
@@ -19,7 +19,7 @@
   <schemaVersion>2.0</schemaVersion>
   <services>
     <service>
-      <name>AMS</name>
+      <name>AMBARI_METRICS</name>
       <version>0.1.0</version>
     </service>
   </services>
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MetricsServiceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MetricsServiceProviderTest.java
index 9e4131fd86..b15201b2c2 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MetricsServiceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MetricsServiceProviderTest.java
@@ -76,7 +76,7 @@ public class MetricsServiceProviderTest {
     Predicate expectedPredicate2 =
       new PredicateBuilder().property(HOST_COMPONENT_CLUSTER_NAME_PROPERTY_ID)
         .equals("c1").and().property(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID)
-        .equals("METRIC_COLLECTOR").toPredicate();
+        .equals("METRICS_COLLECTOR").toPredicate();
 
     ArgumentCaptor<Request> requestCapture = ArgumentCaptor.forClass(Request.class);
     ArgumentCaptor<Predicate> predicateCapture = ArgumentCaptor.forClass(Predicate.class);
@@ -111,7 +111,7 @@ public class MetricsServiceProviderTest {
     when(hostComponentResourceProvider.getResources(any(Request.class),
       any(Predicate.class))).thenReturn(hostComponents);
     when(hostComponent.getPropertyValue
-      (HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID)).thenReturn("METRIC_COLLECTOR");
+      (HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID)).thenReturn("METRICS_COLLECTOR");
     when(hostComponent.getPropertyValue(HOST_COMPONENT_HOST_NAME_PROPERTY_ID)).thenReturn("h1");
 
     service = providerModule.getMetricsServiceType();
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java
index 321e209d61..d8e0b65bd8 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProviderTest.java
@@ -348,7 +348,7 @@ public class AMSPropertyProviderTest {
     String propertyId = PropertyHelper.getPropertyId("metrics/hbase/regionserver", "requests");
     Resource resource = new ResourceImpl(Resource.Type.Component);
     resource.setProperty(HOST_NAME_PROPERTY_ID, "h1");
-    resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "METRIC_COLLECTOR");
+    resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "METRICS_COLLECTOR");
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
     temporalInfoMap.put(propertyId, new TemporalInfoImpl(1421694000L, 1421697600L, 1L));
     Request request = PropertyHelper.getReadRequest(
diff --git a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index ba6cd8c763..c5beeb38b0 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -651,10 +651,10 @@ class TestHDP22StackAdvisor(TestCase):
     services = {
       "services":  [ {
         "StackServices": {
-          "service_name": "AMS"
+          "service_name": "AMBARI_METRICS"
         },"components": [{
           "StackServiceComponents": {
-            "component_name": "METRIC_COLLECTOR",
+            "component_name": "METRICS_COLLECTOR",
             "hostnames": ["host1"]
           }
 
@@ -830,4 +830,4 @@ class TestHDP22StackAdvisor(TestCase):
                      'level': 'WARN'}]
 
     res = self.stackAdvisor.validateMapReduce2Configurations(properties, recommendedDefaults, {}, '', '')
-    self.assertEquals(res, res_expected)
\ No newline at end of file
+    self.assertEquals(res, res_expected)
diff --git a/ambari-shell/ambari-groovy-shell/pom.xml b/ambari-shell/ambari-groovy-shell/pom.xml
index 673913707b..973a104ae4 100644
--- a/ambari-shell/ambari-groovy-shell/pom.xml
+++ b/ambari-shell/ambari-groovy-shell/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-shell</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <relativePath>../../ambari-shell</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -20,7 +20,7 @@
   <artifactId>ambari-groovy-shell</artifactId>
   <packaging>jar</packaging>
   <name>Ambari Groovy Shell</name>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <description>Ambari Groovy Shell</description>
    <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.ambari</groupId>
       <artifactId>groovy-client</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>2.0.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
diff --git a/ambari-shell/ambari-python-shell/pom.xml b/ambari-shell/ambari-python-shell/pom.xml
index 4381e1bba9..ad78f53836 100644
--- a/ambari-shell/ambari-python-shell/pom.xml
+++ b/ambari-shell/ambari-python-shell/pom.xml
@@ -19,14 +19,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-shell</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <relativePath>../../ambari-shell</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-python-shell</artifactId>
   <packaging>pom</packaging>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <name>Ambari Python Shell</name>
   <description>Ambari Python Shell</description>
   <properties>
diff --git a/ambari-shell/pom.xml b/ambari-shell/pom.xml
index b23602e0b8..9dd8825938 100644
--- a/ambari-shell/pom.xml
+++ b/ambari-shell/pom.xml
@@ -21,14 +21,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-shell</artifactId>
   <packaging>pom</packaging>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <name>Ambari Shell</name>
   <description>Ambari Shell</description>
   <modules>
diff --git a/ambari-views/pom.xml b/ambari-views/pom.xml
index cecf8a1fa0..db710e4013 100644
--- a/ambari-views/pom.xml
+++ b/ambari-views/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.ambari</groupId>
         <artifactId>ambari-project</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>2.0.0.0</version>
         <relativePath>../ambari-project</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -28,7 +28,7 @@
     <artifactId>ambari-views</artifactId>
     <packaging>jar</packaging>
     <name>Ambari Views</name>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <description>Ambari View interfaces.</description>
     <url>http://ambari.apache.org/</url>
     <scm>
diff --git a/ambari-web/app/controllers/wizard/step4_controller.js b/ambari-web/app/controllers/wizard/step4_controller.js
index bc433ce362..c4b19a3be3 100644
--- a/ambari-web/app/controllers/wizard/step4_controller.js
+++ b/ambari-web/app/controllers/wizard/step4_controller.js
@@ -82,8 +82,7 @@ App.WizardStep4Controller = Em.ArrayController.extend({
    * @method ambariMetricsValidation
    */
   ambariMetricsValidation: function () {
-    //TODO Change 'AMS' to the actual serviceName after it's changed
-    var ambariMetricsService = this.findProperty('serviceName', 'AMS');
+    var ambariMetricsService = this.findProperty('serviceName', 'AMBARI_METRICS');
     if (ambariMetricsService && !ambariMetricsService.get('isSelected')) {
       this.addValidationError({
         id: 'ambariMetricsCheck',
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 5eb7f22d82..2b2294cf84 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -4180,7 +4180,7 @@ var hdp2properties = [
     "rowStyleClass": "indent-1",
     "filename": "alert_notification"
   },
-/************************************************AMS******************************************/
+/************************************************AMBARI_METRICS******************************************/
   {
     "id": "site property",
     "name": "timeline.metrics.service.operation.mode",
@@ -4188,55 +4188,55 @@ var hdp2properties = [
     "description": "\n      Service Operation modes:\n      1) embedded: Metrics stored on local FS, HBase in Standalone mode\n      2) distributed: HBase daemons writing to HDFS\n      3) external: External HBase storage backend\n    ",
     "defaultValue": "embedded",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "General",
     "index": 1
   },
   {
     "id": "site property",
-    "name": "ams_collector_log_dir",
+    "name": "metrics_collector_log_dir",
     "displayName": "Metrics Collector log dir",
     "description": "\n      Log location for collector logs\n    ",
     "defaultValue": "embedded",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-env.xml",
     "category": "General",
     "index": 2
   },
   {
     "id": "site property",
-    "name": "ams_collector_pid_dir",
+    "name": "metrics_collector_pid_dir",
     "displayName": "Metrics Collector pid dir",
     "description": "\n      pid location for collector\n    ",
     "defaultValue": "embedded",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-env.xml",
     "category": "General",
     "index": 3
   },
   {
     "id": "site property",
-    "name": "ams_monitor_log_dir",
+    "name": "metrics_monitor_log_dir",
     "displayName": "Metrics Monitor log dir",
     "description": "\n      Log location for monitor logs\n    ",
     "defaultValue": "embedded",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-env.xml",
     "category": "General",
     "index": 4
   },
   {
     "id": "site property",
-    "name": "ams_monitor_pid_dir",
+    "name": "metrics_monitor_pid_dir",
     "displayName": "Metrics Monitor pid dir",
     "description": "\n      pid location for monitor\n    ",
     "defaultValue": "embedded",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-env.xml",
     "category": "General",
     "index": 5
@@ -4248,7 +4248,7 @@ var hdp2properties = [
     "description": "\n      Directory to store aggregator checkpoints\n    ",
     "defaultValue": "/tmp",
     "displayType": "directory",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 17
@@ -4260,7 +4260,7 @@ var hdp2properties = [
     "description": "\n      Multiplier value * interval = Max allowed checkpoint lag. Effectively\n      if aggregator checkpoint is greater than max allowed checkpoint delay,\n      the checkpoint will be discarded by the aggregator.\n    ",
     "defaultValue": "2",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 16
@@ -4272,7 +4272,7 @@ var hdp2properties = [
     "description": "\n      Disable cluster based hourly aggregations.\n    ",
     "defaultValue": "false",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 14
@@ -4284,7 +4284,7 @@ var hdp2properties = [
     "description": "\n      Time in seconds to sleep for the hourly resolution cluster wide\n      aggregator. Default is 1 hour.\n    ",
     "defaultValue": "3600",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 15
@@ -4296,7 +4296,7 @@ var hdp2properties = [
     "description": "\n      Multiplier value * interval = Max allowed checkpoint lag. Effectively\n      if aggregator checkpoint is greater than max allowed checkpoint delay,\n      the checkpoint will be discarded by the aggregator.\n    ",
     "defaultValue": "2",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 13
@@ -4308,7 +4308,7 @@ var hdp2properties = [
     "description": "\n      Disable cluster based minute aggregations.\n    ",
     "defaultValue": "false",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 10
@@ -4320,7 +4320,7 @@ var hdp2properties = [
     "description": "\n      Time in seconds to sleep for the minute resolution cluster wide\n      aggregator. Default resolution is 2 minutes.\n    ",
     "defaultValue": "120",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 11
@@ -4332,7 +4332,7 @@ var hdp2properties = [
     "description": "\n      Lowest resolution of desired data for cluster level minute aggregates.\n    ",
     "defaultValue": "15",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 12
@@ -4344,7 +4344,7 @@ var hdp2properties = [
     "description": "\n      Multiplier value * interval = Max allowed checkpoint lag. Effectively\n      if aggregator checkpoint is greater than max allowed checkpoint delay,\n      the checkpoint will be discarded by the aggregator.\n    ",
     "defaultValue": "2",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 9
@@ -4356,7 +4356,7 @@ var hdp2properties = [
     "description": "\n      Disable host based hourly aggregations\n    ",
     "defaultValue": "false",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 7
@@ -4368,7 +4368,7 @@ var hdp2properties = [
     "description": "\n      Time in seconds to sleep for the hourly resolution host based\n      aggregator. Default resolution is 1 hour.\n    ",
     "defaultValue": "3600",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 8
@@ -4380,7 +4380,7 @@ var hdp2properties = [
     "description": "\n      Multiplier value * interval = Max allowed checkpoint lag. Effectively\n      if aggregator checkpoint is greater than max allowed checkpoint delay,\n      the checkpoint will be discarded by the aggregator.\n    ",
     "defaultValue": "2",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 6
@@ -4392,7 +4392,7 @@ var hdp2properties = [
     "description": "\n      Disable host based minute aggregations.\n    ",
     "defaultValue": "false",
     "displayType": "string",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 4
@@ -4404,7 +4404,7 @@ var hdp2properties = [
     "description": "\n      Time in seconds to sleep for the minute resolution host based\n      aggregator. Default resolution is 5 minutes.\n    ",
     "defaultValue": "300",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 5
@@ -4416,7 +4416,7 @@ var hdp2properties = [
     "description": "\n      Time in seconds to sleep on the first run or when the checkpoint is\n      too old.\n    ",
     "defaultValue": "120",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 1
@@ -4428,7 +4428,7 @@ var hdp2properties = [
     "description": "\n      Max result limit on number of rows returned. Calculated as follows:\n      4 aggregate metrics/min * 60 * 24: Retrieve aggregate data for 1 day.\n    ",
     "defaultValue": "5760",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 2
@@ -4440,7 +4440,7 @@ var hdp2properties = [
     "description": "\n      JDBC resultset prefect size for aggregator queries.\n    ",
     "defaultValue": "2000",
     "displayType": "int",
-    "serviceName": "AMS",
+    "serviceName": "AMBARI_METRICS",
     "filename": "ams-site.xml",
     "category": "MetricCollector",
     "index": 3
diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js
index ad1236ffee..c950e4845b 100644
--- a/ambari-web/app/models/stack_service.js
+++ b/ambari-web/app/models/stack_service.js
@@ -319,7 +319,7 @@ App.StackService.configCategories = function () {
         App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'})
       ]);
       break;
-    case 'AMS':
+    case 'AMBARI_METRICS':
       serviceConfigCategories.pushObjects([
         App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'}),
         App.ServiceConfigCategory.create({ name: 'MetricCollector', displayName: 'Metric Collector'})
diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml
index db6951ec85..39628bb26f 100644
--- a/ambari-web/pom.xml
+++ b/ambari-web/pom.xml
@@ -20,14 +20,14 @@
   <parent>
     <groupId>org.apache.ambari</groupId>
     <artifactId>ambari-project</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>2.0.0.0</version>
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>ambari-web</artifactId>
   <packaging>pom</packaging>
   <name>Ambari Web</name>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <description>Ambari Web</description>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/ambari-web/test/controllers/wizard/step4_test.js b/ambari-web/test/controllers/wizard/step4_test.js
index 3e85a04688..00965c8e92 100644
--- a/ambari-web/test/controllers/wizard/step4_test.js
+++ b/ambari-web/test/controllers/wizard/step4_test.js
@@ -25,7 +25,7 @@ describe('App.WizardStep4Controller', function () {
 
   var services = [
     'HDFS', 'GANGLIA', 'OOZIE', 'HIVE', 'HBASE', 'PIG', 'SCOOP', 'ZOOKEEPER',
-    'YARN', 'MAPREDUCE2', 'FALCON', 'TEZ', 'STORM', 'AMS', 'RANGER'
+    'YARN', 'MAPREDUCE2', 'FALCON', 'TEZ', 'STORM', 'AMBARI_METRICS', 'RANGER'
   ];
 
   var controller = App.WizardStep4Controller.create();
@@ -260,35 +260,35 @@ describe('App.WizardStep4Controller', function () {
           errorsExpected: ['ambariMetricsCheck']
         },
         {
-          services: ['HDFS','ZOOKEEPER', 'AMS'],
+          services: ['HDFS','ZOOKEEPER', 'AMBARI_METRICS'],
           errorsExpected: []
         },
         {
-          services: ['ZOOKEEPER', 'AMS'],
+          services: ['ZOOKEEPER', 'AMBARI_METRICS'],
           errorsExpected: []
         },
         {
-          services: ['HDFS', 'AMS'],
+          services: ['HDFS', 'AMBARI_METRICS'],
           errorsExpected: ['serviceCheck_ZOOKEEPER']
         },
         {
-          services: ['HDFS', 'TEZ', 'ZOOKEEPER', 'AMS'],
+          services: ['HDFS', 'TEZ', 'ZOOKEEPER', 'AMBARI_METRICS'],
           errorsExpected: ['serviceCheck_YARN']
         },
         {
-          services: ['HDFS', 'ZOOKEEPER', 'FALCON', 'AMS'],
+          services: ['HDFS', 'ZOOKEEPER', 'FALCON', 'AMBARI_METRICS'],
           errorsExpected: ['serviceCheck_OOZIE']
         },
         {
-          services: ['HDFS', 'ZOOKEEPER', 'GANGLIA', 'HIVE', 'AMS'],
+          services: ['HDFS', 'ZOOKEEPER', 'GANGLIA', 'HIVE', 'AMBARI_METRICS'],
           errorsExpected: ['serviceCheck_YARN']
         },
         {
-          services: ['HDFS', 'GLUSTERFS', 'ZOOKEEPER', 'HIVE', 'AMS'],
+          services: ['HDFS', 'GLUSTERFS', 'ZOOKEEPER', 'HIVE', 'AMBARI_METRICS'],
           errorsExpected: ['serviceCheck_YARN', 'multipleDFS']
         },
         {
-          services: ['HDFS','ZOOKEEPER', 'GANGLIA', 'AMS'],
+          services: ['HDFS','ZOOKEEPER', 'GANGLIA', 'AMBARI_METRICS'],
           errorsExpected: []
         },
         {
@@ -530,13 +530,13 @@ describe('App.WizardStep4Controller', function () {
         title: 'Ambari Metrics not available'
       },
       {
-        services: ['AMS'],
+        services: ['AMBARI_METRICS'],
         isAmbariMetricsSelected: false,
         isAmbariMetricsWarning: true,
         title: 'Ambari Metrics not selected'
       },
       {
-        services: ['AMS'],
+        services: ['AMBARI_METRICS'],
         isAmbariMetricsSelected: true,
         isAmbariMetricsWarning: false,
         title: 'Ambari Metrics selected'
@@ -547,8 +547,8 @@ describe('App.WizardStep4Controller', function () {
       it(item.title, function () {
         controller.clear();
         controller.set('content', generateSelectedServicesContent(item.services));
-        var ams = controller.findProperty('serviceName', 'AMS');
-        if (item.services.contains('AMS')) {
+        var ams = controller.findProperty('serviceName', 'AMBARI_METRICS');
+        if (item.services.contains('AMBARI_METRICS')) {
           ams.set('isSelected', item.isAmbariMetricsSelected);
         } else {
           controller.removeObject(ams);
diff --git a/ambari-web/test/controllers/wizard/step7_test.js b/ambari-web/test/controllers/wizard/step7_test.js
index 65260109a1..1d0bcf222e 100644
--- a/ambari-web/test/controllers/wizard/step7_test.js
+++ b/ambari-web/test/controllers/wizard/step7_test.js
@@ -1322,7 +1322,7 @@ describe('App.InstallerStep7Controller', function () {
   describe('#setInstalledServiceConfigs', function () {
 
     var controller = App.WizardStep7Controller.create({
-        installedServiceNames: ['HBASE', 'AMS']
+        installedServiceNames: ['HBASE', 'AMBARI_METRICS']
       }),
       serviceConfigTags = [
         {
@@ -1348,7 +1348,7 @@ describe('App.InstallerStep7Controller', function () {
         {
           name: 'hbase.client.scanner.caching',
           value: '2000',
-          serviceName: 'AMS',
+          serviceName: 'AMBARI_METRICS',
           filename: 'ams-hbase-site.xml'
         }
       ],
@@ -1372,7 +1372,7 @@ describe('App.InstallerStep7Controller', function () {
           tag: 'version1'
         }
       ],
-      installedServiceNames = ['HBASE', 'AMS'];
+      installedServiceNames = ['HBASE', 'AMBARI_METRICS'];
 
     it('should handle properties with the same name', function () {
       controller.setInstalledServiceConfigs(serviceConfigTags, configs, configsByTags, installedServiceNames);
diff --git a/ambari-web/test/mock_data_setup/configs_mock_data.js b/ambari-web/test/mock_data_setup/configs_mock_data.js
index bfbd2b8e1a..0136f9b10f 100644
--- a/ambari-web/test/mock_data_setup/configs_mock_data.js
+++ b/ambari-web/test/mock_data_setup/configs_mock_data.js
@@ -213,7 +213,7 @@ module.exports = {
       {
         "name": "hbase_log_dir",
         "value": "/hadoop/ams-hbase",
-        "serviceName": "AMS",
+        "serviceName": "AMBARI_METRICS",
         "filename": "ams-hbase-env.xml"
       }
     ];
diff --git a/ambari-web/test/utils/config_test.js b/ambari-web/test/utils/config_test.js
index 44e895183f..d228f3aa7e 100644
--- a/ambari-web/test/utils/config_test.js
+++ b/ambari-web/test/utils/config_test.js
@@ -254,7 +254,7 @@ describe('App.config', function () {
       expect(properties).to.have.length(2);
       expect(hbaseProperty.serviceName).to.equal('HBASE');
       expect(hbaseProperty.value).to.equal('/hadoop/hbase');
-      expect(amsProperty.serviceName).to.equal('AMS');
+      expect(amsProperty.serviceName).to.equal('AMBARI_METRICS');
       expect(amsProperty.value).to.equal('/hadoop/ams-hbase');
     });
   });
diff --git a/contrib/views/pom.xml b/contrib/views/pom.xml
index 04ed917b49..e6037f30df 100644
--- a/contrib/views/pom.xml
+++ b/contrib/views/pom.xml
@@ -142,7 +142,7 @@
       <dependency>
         <groupId>org.apache.ambari</groupId>
         <artifactId>ambari-views</artifactId>
-        <version>[${ambari.version},)</version>
+        <version>2.0.0.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index 192ce3f186..ce36b576d9 100644
--- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++ b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -263,8 +263,8 @@ public class SliderAppsViewControllerImpl implements SliderAppsViewController {
             }
             if (cluster.getDesiredConfigs().containsKey("ams-site")) {
               Map<String, String> amsConfigs = ambariClient.getConfiguration(cluster, "ams-site", cluster.getDesiredConfigs().get("ams-site"));
-              AmbariService amsService = ambariClient.getService(cluster, "AMS");
-              List<AmbariHostComponent> hostsList = amsService.getComponentsToHostComponentsMap().get("METRIC_COLLECTOR");
+              AmbariService amsService = ambariClient.getService(cluster, "AMBARI_METRICS");
+              List<AmbariHostComponent> hostsList = amsService.getComponentsToHostComponentsMap().get("METRICS_COLLECTOR");
               if (hostsList != null && hostsList.size() > 0) {
                 String collectorHostName = hostsList.get(0).getHostName();
                 newHadoopConfigs.put(PROPERTY_METRICS_SERVER_HOSTNAME, collectorHostName);
diff --git a/contrib/views/slider/src/main/resources/ui/app/initialize.js b/contrib/views/slider/src/main/resources/ui/app/initialize.js
index a0dd9a0c28..03fd52aede 100755
--- a/contrib/views/slider/src/main/resources/ui/app/initialize.js
+++ b/contrib/views/slider/src/main/resources/ui/app/initialize.js
@@ -103,13 +103,13 @@ App.initializer({
       viewErrors: [],
 
       /**
-       * Host with Metrics Server (AMS)
+       * Host with Metrics Server (AMBARI_METRICS)
        * @type {string|null}
        */
       metricsHost: null,
 
       /**
-       * Port of Metrics Server (AMS port)
+       * Port of Metrics Server (AMBARI_METRICS port)
        * @type {array|null}
        */
       metricsPort: null,
diff --git a/pom.xml b/pom.xml
index d33828b2a6..c2055ff3c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <artifactId>ambari</artifactId>
   <packaging>pom</packaging>
   <name>Ambari Main</name>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>2.0.0.0</version>
   <description>Ambari</description>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>