diff --git a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallableFactory.java b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallableFactory.java
index 33e2ff886e..9c90019c75 100644
--- a/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallableFactory.java
+++ b/gax-java/gax-httpjson/src/main/java/com/google/api/gax/httpjson/HttpJsonCallableFactory.java
@@ -52,10 +52,8 @@
 
 /** Class with utility methods to create http/json-based direct callables. */
 public class HttpJsonCallableFactory {
-  // Used to extract service and method name from a grpc MethodDescriptor.
-  // fullMethodName has the format: service.resource.action
-  // For example: compute.instances.addAccessConfig
-  private static final Pattern FULL_METHOD_NAME_REGEX = Pattern.compile("^(.+)\\.(.+)$");
+  // Used to extract service and method name from a HttpJson MethodDescriptor.
+  private static final Pattern FULL_METHOD_NAME_REGEX = Pattern.compile("^.*?([^./]+)/([^./]+)$");
 
   private HttpJsonCallableFactory() {}
 
diff --git a/gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/HttpJsonCallableFactoryTest.java b/gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/HttpJsonCallableFactoryTest.java
index 4d0785f242..caf782d464 100644
--- a/gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/HttpJsonCallableFactoryTest.java
+++ b/gax-java/gax-httpjson/src/test/java/com/google/api/gax/httpjson/HttpJsonCallableFactoryTest.java
@@ -50,8 +50,8 @@ public class HttpJsonCallableFactoryTest {
   public void testGetSpanName() {
     Map<String, SpanName> validNames =
         ImmutableMap.of(
-            "compute.projects.disableXpnHost", SpanName.of("compute.projects", "disableXpnHost"),
-            "client.method", SpanName.of("client", "method"));
+            "google.cloud.service.v1.CoolService/CoolRPC", SpanName.of("CoolService", "CoolRPC"),
+            "CoolService/CoolRPC", SpanName.of("CoolService", "CoolRPC"));
 
     for (Entry<String, SpanName> entry : validNames.entrySet()) {
       @SuppressWarnings("unchecked")