diff --git a/code/API_definitions/README.MD b/code/API_definitions/README.MD
deleted file mode 100644
index 04313f1..0000000
--- a/code/API_definitions/README.MD
+++ /dev/null
@@ -1 +0,0 @@
-Here you can add your definitions and delete this README.MD file
diff --git a/code/API_definitions/application-profiles.yaml b/code/API_definitions/application-profiles.yaml
index 2ddbb3e..f5bb79d 100644
--- a/code/API_definitions/application-profiles.yaml
+++ b/code/API_definitions/application-profiles.yaml
@@ -1,24 +1,21 @@
 ---
     openapi: 3.0.3
     info:
-      title: Connectivity Insights API
-      version: '0.3.0-wip'
-      contact:
-       email: sp-coi@lists.camaraproject.org
+      title: Connectivity Insights - Application Profiles
+      version: wip
       license:
          name: Apache 2.0
          url: https://www.apache.org/licenses/LICENSE-2.0.html
       description: |
         Application profiles allows application developers to share all the information about their application which would be relavant in network/CAMARA APIs related decision making.  //todo
+      x-camara-commonalities: 0.4.0
+      
     servers:
-    - url: "{apiRoot}/{basePath}"
+    - url: "{apiRoot}/application-profiles/v0.3"
       variables:
         apiRoot:
           default: http://localhost:9091
           description: API root
-        basePath:
-          default: connectivity-insights/v0
-          description: Base path for the Connectivity Insights API
 
     tags:
     - name: Application Profiles
@@ -415,4 +412,4 @@
               example:
                 status: 503
                 code: UNAVAILABLE
-                message: "Service unavailable"
\ No newline at end of file
+                message: "Service unavailable"
diff --git a/code/API_definitions/CAMARA Connectivity Insights API.yaml b/code/API_definitions/connectivity-insights.yaml
similarity index 99%
rename from code/API_definitions/CAMARA Connectivity Insights API.yaml
rename to code/API_definitions/connectivity-insights.yaml
index dbfb8aa..12ab792 100644
--- a/code/API_definitions/CAMARA Connectivity Insights API.yaml	
+++ b/code/API_definitions/connectivity-insights.yaml
@@ -1,13 +1,12 @@
 ---
     openapi: 3.0.3
     info:
-      title: Connectivity Insights API
+      title: Connectivity Insights
       version: 'wip'
-      contact:
-       email: sp-coi@lists.camaraproject.org
       license:
          name: Apache 2.0
          url: https://www.apache.org/licenses/LICENSE-2.0.html
+      x-camara-commonalities: 0.4.0
       description: |
         The Connectivity Insights API allows an application developer to ask
          the network the likelihood that an application's networking
@@ -65,14 +64,11 @@
         upholding the principles of transparency and user-centric data control.
 
     servers:
-    - url: "{apiRoot}/{basePath}"
+    - url: "{apiRoot}/connectivity-insights/v0.3"
       variables:
         apiRoot:
           default: http://localhost:9091
           description: API root
-        basePath:
-          default: connectivity-insights/v0
-          description: Base path for the Connectivity Insights API
 
     tags:
     - name: Quality Insights