diff --git a/pom.xml b/pom.xml
index 543db6c..2a41ea7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,21 +114,6 @@
             </plugin>
 
             <!-- requirement plugins -->
-
-            <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-javadoc-plugin</artifactId>
-               <version>3.6.0</version>
-               <executions>
-                  <execution>
-                    <id>attach-javadocs</id>
-                    <goals>
-                       <goal>jar</goal>
-                    </goals>
-                  </execution>
-              </executions>
-            </plugin>    
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
diff --git a/uprotocol/README.adoc b/uprotocol/README.adoc
deleted file mode 100644
index a8483f7..0000000
--- a/uprotocol/README.adoc
+++ /dev/null
@@ -1,45 +0,0 @@
-= uProtocol Application Layer (uP-L3) APIs
-:toc:
-
-----
-Copyright (c) 2023 General Motors GTO LLC
-
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  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.
-----
-
-.Protobuf Files
-|===
-|File |Description
-
-|*link:options.proto[]*
-| Definition of uProtocol specific metadata used for uDiscovery & uSubscription. Metadata includes ID mapping (for method, topic, service names to IDs) as well as field properties
-
-|*link:topic.proto[]*
-|Definition of a Topic message used by uSubscription and uTwin
-
-|*link:units.proto[]*
-|Define common Units used in uProtocol service definition
-
-|*link:uri.proto[]*
-| Definition of a UriRequest and UriResponse used by uDiscovery
-
-|*link:core[]*
-|Core uProtocol services (uDiscovery, uSubscription, uTwin)
-
-|===
-
diff --git a/uprotocol/uattributes.proto b/uprotocol/uattributes.proto
index 29811a1..4e41088 100644
--- a/uprotocol/uattributes.proto
+++ b/uprotocol/uattributes.proto
@@ -28,6 +28,7 @@
 
  import "uri.proto";
  import "uuid.proto";
+ import "uprotocol_options.proto";
 
  option java_package = "org.eclipse.uprotocol.v1";
  option java_outer_classname = "UAttributesProto";
@@ -81,9 +82,9 @@ message UAttributes {
 // validity of the data in the {@link UAttributes}.
 enum UMessageType {
     UMESSAGE_TYPE_UNSPECIFIED = 0; // Unspecified message type
-    UMESSAGE_TYPE_PUBLISH = 1;    // Publish or notification
-    UMESSAGE_TYPE_REQUEST = 2;    // Request 
-    UMESSAGE_TYPE_RESPONSE = 3;   // Response
+    UMESSAGE_TYPE_PUBLISH = 1 [(uprotocol.ce_name) = "pub.v1"];    // Publish or notification
+    UMESSAGE_TYPE_REQUEST = 2 [(uprotocol.ce_name) = "req.v1"];    // Request 
+    UMESSAGE_TYPE_RESPONSE = 3 [(uprotocol.ce_name) = "res.v1"];   // Response
 }
 
 
@@ -94,23 +95,23 @@ enum UPriority {
     UPRIORITY_UNSPECIFIED = 0;
 
     // Low Priority. No bandwidth assurance such as File Transfer.
-    UPRIORITY_CS0 = 1;
+    UPRIORITY_CS0 = 1 [(uprotocol.ce_name) = "CS0"];
 
     // Standard, undifferentiated application such as General (unclassified).
-    UPRIORITY_CS1 = 2;
+    UPRIORITY_CS1 = 2 [(uprotocol.ce_name) = "CS1"];
 
     // Operations, Administration, and Management such as Streamer messages (sub, connect, etc…)
-    UPRIORITY_CS2 = 3;
+    UPRIORITY_CS2 = 3 [(uprotocol.ce_name) = "CS2"];
 
     // Multimedia streaming such as Video Streaming
-    UPRIORITY_CS3 = 4;
+    UPRIORITY_CS3 = 4 [(uprotocol.ce_name) = "CS3"];
 
     // Real-time interactive such as High priority (rpc events)
-    UPRIORITY_CS4 = 5;
+    UPRIORITY_CS4 = 5 [(uprotocol.ce_name) = "CS4"];
 
     // Signaling such as Important
-    UPRIORITY_CS5 = 6;
+    UPRIORITY_CS5 = 6 [(uprotocol.ce_name) = "CS5"];
 
     // Network control such as Safety Critical
-    UPRIORITY_CS6 = 7;
+    UPRIORITY_CS6 = 7 [(uprotocol.ce_name) = "CS6"];
 }
diff --git a/uprotocol/uprotocol_options.proto b/uprotocol/uprotocol_options.proto
index 7f17f26..c7ffcf2 100644
--- a/uprotocol/uprotocol_options.proto
+++ b/uprotocol/uprotocol_options.proto
@@ -76,4 +76,7 @@ extend google.protobuf.FieldOptions {
 extend google.protobuf.EnumValueOptions {
   // MIME type mapping
   optional string mime_type = 50500;
+
+  // CloudEvent String representation of the uProtocol enum value
+  optional string ce_name = 50501;
 }
\ No newline at end of file