diff --git a/src/org/apache/cassandra/gms/FailureDetector.java b/src/org/apache/cassandra/gms/FailureDetector.java
index af3dbbe40e..a14c3f3544 100644
--- a/src/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/org/apache/cassandra/gms/FailureDetector.java
@@ -85,7 +85,7 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
         try
         {
             MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
-            mbs.registerMBean(this, new ObjectName("com.facebook.infrastructure.gms:type=FailureDetector"));
+            mbs.registerMBean(this, new ObjectName("org.apache.cassandra.gms:type=FailureDetector"));
         }
         catch (Exception e)
         {
diff --git a/src/org/apache/cassandra/service/StorageService.java b/src/org/apache/cassandra/service/StorageService.java
index 3d9dd8dcf0..f8b02af70f 100644
--- a/src/org/apache/cassandra/service/StorageService.java
+++ b/src/org/apache/cassandra/service/StorageService.java
@@ -293,7 +293,7 @@ public final class StorageService implements IEndPointStateChangeSubscriber, Sto
         {
             MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
             mbs.registerMBean(this, new ObjectName(
-                    "com.facebook.infrastructure.service:type=StorageService"));
+                    "org.apache.cassandra.service:type=StorageService"));
         }
         catch (Exception e)
         {