diff --git a/cmake/CommonConfigs.cmake b/cmake/CommonConfigs.cmake
index 569f8d3..d34f2b9 100644
--- a/cmake/CommonConfigs.cmake
+++ b/cmake/CommonConfigs.cmake
@@ -60,8 +60,8 @@
     DEFAULT 1)
 
 arm_config_option(
-    NAME RMM_CCA_DA
-    HELP "Enable Device Assignment support in RMM (experimental)"
+    NAME RMM_V1_1
+    HELP "Enable v1.1 features in RMM (experimental)"
     TYPE BOOL
     DEFAULT OFF)
 
@@ -139,10 +139,10 @@
 target_compile_definitions(rmm-common
     INTERFACE "COMMIT_INFO=\"${COMMIT_INFO}\"")
 
-if(RMM_CCA_DA)
-    message(WARNING "DA is an experimental feature")
+if(RMM_V1_1)
+    message(WARNING "RMM v1.1 features are experimental")
     target_compile_definitions(rmm-common
-        INTERFACE "RMM_CCA_DA=1")
+        INTERFACE "RMM_V1_1=1")
 endif()
 
 link_libraries(rmm-common)
diff --git a/configs/mbedtls/rmm_mbedtls_config.h b/configs/mbedtls/rmm_mbedtls_config.h
index b7f713d..3adafb1 100644
--- a/configs/mbedtls/rmm_mbedtls_config.h
+++ b/configs/mbedtls/rmm_mbedtls_config.h
@@ -95,8 +95,11 @@
 #define MBEDTLS_SHA512_USE_A64_CRYPTO_ONLY
 #endif
 
-/* Configs required by SPDM requester used by RMM_CCA_DA */
-#ifdef RMM_CCA_DA
+/*
+ * Configs required by SPDM requester used by Device Assignment feature in
+ * RMM v1.1
+ */
+#ifdef RMM_V1_1
 #define MBEDTLS_OID_C
 #define MBEDTLS_RSA_C
 #define MBEDTLS_PKCS1_V15
@@ -127,7 +130,7 @@
 #define MBEDTLS_ECP_DP_SECP256R1_ENABLED
 #define MBEDTLS_ECP_DP_SECP384R1_ENABLED
 #define MBEDTLS_ECP_DP_SECP521R1_ENABLED
-#endif /* RMM_CCA_DA */
+#endif /* RMM_V1_1 */
 
 /*
  * Declare memory allocation primitives to be used by MbedTLS
diff --git a/docs/getting_started/build-options.rst b/docs/getting_started/build-options.rst
index 929b1f6..a3a17b7 100644
--- a/docs/getting_started/build-options.rst
+++ b/docs/getting_started/build-options.rst
@@ -290,7 +290,7 @@
    RMM_HTML_COV_REPORT		,ON | OFF		,ON			,"Enable HTML output report for coverage analysis"
    RMM_CBMC_VIEWER_OUTPUT	,ON | OFF		,OFF			,"Generate report of CBMC results using the tool cbmc-viewer"
    RMM_CBMC_SINGLE_TESTBENCH	,			,OFF			,"Run CBMC on a single testbench instead on all of them"
-   RMM_CCA_DA			,ON | OFF		,OFF			,"Enable Device Assignment support in RMM (experimental)"
+   RMM_V1_1			,ON | OFF		,OFF			,"Enable v1.1 features (experimental)"
    ATTEST_PLAT_TOKEN_SIZE	,			,0x1000			,"Maximum size in bytes expected for the Attestation platform token"
    PLAT_ARM_MAX_DRAM_BANKS	,			,2			,"Maximum number of DRAM banks allowed in Arm platform layer"
    ATTEST_EL3_TOKEN_SIGN	,ON|OFF			,OFF			,"Use EL3 service to sign realm attestation token."
diff --git a/docs/readme.rst b/docs/readme.rst
index 0383d1c..bb5bc00 100644
--- a/docs/readme.rst
+++ b/docs/readme.rst
@@ -73,7 +73,7 @@
 projects and they are to be cloned from their repositories into ``ext`` folder
 before building. The projects are `MbedTLS`_, `t_cose`_, `QCBOR`_,
 `CppUTest`_ and `libspdm`_. `libspdm`_ repository is fetched during config phase
-when RMM_CCA_DA build option is enabled.
+when RMM_V1_1 build option is enabled.
 
 The project also contains files which are imported from other projects
 into the source tree and may have a different license. Such files with
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 449ed02..7c06f65 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -43,7 +43,8 @@
 add_subdirectory("t_cose")
 add_subdirectory("xlat")
 
-if(RMM_CCA_DA)
+# Device Assignment feature in RMM v1.1 needs rmm-lib-spdm_requester
+if(RMM_V1_1)
     target_link_libraries(rmm-lib INTERFACE rmm-lib-spdm_requester)
     add_subdirectory("spdm_requester")
 endif()
diff --git a/lib/mbedtls/CMakeLists.txt b/lib/mbedtls/CMakeLists.txt
index 417e91c..aa6956c 100644
--- a/lib/mbedtls/CMakeLists.txt
+++ b/lib/mbedtls/CMakeLists.txt
@@ -55,7 +55,7 @@
 
 # Include targets mbedcrypto, mbedx509
 set(MBEDTLS_LIBS mbedcrypto)
-if(RMM_CCA_DA)
+if(RMM_V1_1)
     list(APPEND MBEDTLS_LIBS mbedx509)
 endif()