Index: exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java
===================================================================
--- exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java	(revision 5937)
+++ exo.kernel.container/src/main/java/org/exoplatform/container/RootContainer.java	(working copy)
@@ -34,7 +34,7 @@
 import org.exoplatform.container.xml.Configuration;
 import org.exoplatform.management.annotations.Managed;
 import org.exoplatform.management.annotations.ManagedDescription;
-import org.exoplatform.management.jmx.annotations.NamingContext;
+import org.exoplatform.management.jmx.annotations.NameTemplate;
 import org.exoplatform.management.jmx.annotations.Property;
 import org.exoplatform.management.rest.annotations.RESTEndpoint;
 import org.exoplatform.services.log.ExoLogger;
@@ -61,7 +61,7 @@
  * tuan08@users.sourceforge.net Date: Jul 21, 2004 Time: 12:15:28 AM
  */
 @Managed
-@NamingContext(@Property(key = "container", value = "root"))
+@NameTemplate(@Property(key = "container", value = "root"))
 @RESTEndpoint(path = "rcontainer")
 public class RootContainer extends ExoContainer
 {
Index: exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java
===================================================================
--- exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java	(revision 5937)
+++ exo.kernel.container/src/main/java/org/exoplatform/container/StandaloneContainer.java	(working copy)
@@ -29,7 +29,7 @@
 import org.exoplatform.container.xml.Configuration;
 import org.exoplatform.management.annotations.Managed;
 import org.exoplatform.management.annotations.ManagedDescription;
-import org.exoplatform.management.jmx.annotations.NamingContext;
+import org.exoplatform.management.jmx.annotations.NameTemplate;
 import org.exoplatform.management.jmx.annotations.Property;
 import org.exoplatform.management.rest.annotations.RESTEndpoint;
 import org.exoplatform.services.log.ExoLogger;
@@ -58,7 +58,7 @@
  *          (from where JVM is started) for standalone. See
  */
 @Managed
-@NamingContext(@Property(key = "container", value = "standalone"))
+@NameTemplate(@Property(key = "container", value = "standalone"))
 @RESTEndpoint(path = "scontainer")
 public class StandaloneContainer extends ExoContainer implements SessionManagerContainer
 {
