diff --git a/src/main/java/io/appium/java_client/remote/options/W3CCapabilityKeys.java b/src/main/java/io/appium/java_client/remote/options/W3CCapabilityKeys.java
index b29150311..09ff1680f 100644
--- a/src/main/java/io/appium/java_client/remote/options/W3CCapabilityKeys.java
+++ b/src/main/java/io/appium/java_client/remote/options/W3CCapabilityKeys.java
@@ -23,7 +23,7 @@
 public class W3CCapabilityKeys implements Predicate<String> {
     public static final W3CCapabilityKeys INSTANCE = new W3CCapabilityKeys();
     private static final Predicate<String> ACCEPTED_W3C_PATTERNS = Stream.of(
-                    "^[\\w-]+:.*$",
+                    "^[\\w-\\.]+:.*$",
                     "^acceptInsecureCerts$",
                     "^browserName$",
                     "^browserVersion$",
diff --git a/src/test/java/io/appium/java_client/remote/options/BaseOptionsTest.java b/src/test/java/io/appium/java_client/remote/options/BaseOptionsTest.java
new file mode 100644
index 000000000..50e36818d
--- /dev/null
+++ b/src/test/java/io/appium/java_client/remote/options/BaseOptionsTest.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ * 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.
+ */
+
+package io.appium.java_client.remote.options;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class BaseOptionsTest {
+
+    @ParameterizedTest
+    @CsvSource({
+        "test, appium:test",
+        "appium:test, appium:test",
+        "browserName, browserName",
+        "digital.ai:accessKey, digital.ai:accessKey",
+        "digital-ai:accessKey, digital-ai:accessKey",
+        "digital-ai:my_custom-cap:xyz, digital-ai:my_custom-cap:xyz",
+        "digital-ai:my_custom-cap?xyz, digital-ai:my_custom-cap?xyz",
+    })
+    void verifyW3CMapping(String capName, String expected) {
+        var w3cName = BaseOptions.toW3cName(capName);
+        assertEquals(expected, w3cName);
+    }
+}
\ No newline at end of file