diff --git a/api/src/main/java/io/cloudevents/v03/http/HTTPAttributeMapper.java b/api/src/main/java/io/cloudevents/v03/http/AttributeMapper.java
similarity index 96%
rename from api/src/main/java/io/cloudevents/v03/http/HTTPAttributeMapper.java
rename to api/src/main/java/io/cloudevents/v03/http/AttributeMapper.java
index d391cedd..bdc5a740 100644
--- a/api/src/main/java/io/cloudevents/v03/http/HTTPAttributeMapper.java
+++ b/api/src/main/java/io/cloudevents/v03/http/AttributeMapper.java
@@ -31,8 +31,8 @@ import io.cloudevents.v03.ContextAttributes;
  * @author fabiojose
  *
  */
-public class HTTPAttributeMapper {
-	private HTTPAttributeMapper() {}
+public class AttributeMapper {
+	private AttributeMapper() {}
 
 	static final String HEADER_PREFIX = "ce-";
 
diff --git a/api/src/main/java/io/cloudevents/v03/http/HTTPExtensionMapper.java b/api/src/main/java/io/cloudevents/v03/http/ExtensionMapper.java
similarity index 93%
rename from api/src/main/java/io/cloudevents/v03/http/HTTPExtensionMapper.java
rename to api/src/main/java/io/cloudevents/v03/http/ExtensionMapper.java
index 08598c0f..39abf20a 100644
--- a/api/src/main/java/io/cloudevents/v03/http/HTTPExtensionMapper.java
+++ b/api/src/main/java/io/cloudevents/v03/http/ExtensionMapper.java
@@ -30,12 +30,12 @@ import io.cloudevents.v03.ContextAttributes;
  * @author fabiojose
  * @version 0.2
  */
-public class HTTPExtensionMapper {
-	private HTTPExtensionMapper() {}
+public class ExtensionMapper {
+	private ExtensionMapper() {}
 	
 	private static final List<String> RESERVED_HEADERS = 
 			ContextAttributes.VALUES.stream()
-				.map(attribute -> HTTPAttributeMapper
+				.map(attribute -> AttributeMapper
 						.HEADER_PREFIX + attribute)
 				.collect(Collectors.toList());
 		static {
diff --git a/api/src/main/java/io/cloudevents/v03/http/HTTPHeaderMapper.java b/api/src/main/java/io/cloudevents/v03/http/HeaderMapper.java
similarity index 93%
rename from api/src/main/java/io/cloudevents/v03/http/HTTPHeaderMapper.java
rename to api/src/main/java/io/cloudevents/v03/http/HeaderMapper.java
index e2fa3409..43deb621 100644
--- a/api/src/main/java/io/cloudevents/v03/http/HTTPHeaderMapper.java
+++ b/api/src/main/java/io/cloudevents/v03/http/HeaderMapper.java
@@ -15,7 +15,7 @@
  */
 package io.cloudevents.v03.http;
 
-import static io.cloudevents.v03.http.HTTPAttributeMapper.HEADER_PREFIX;
+import static io.cloudevents.v03.http.AttributeMapper.HEADER_PREFIX;
 
 import java.util.Locale;
 import java.util.Map;
@@ -31,8 +31,8 @@ import io.cloudevents.v03.ContextAttributes;
  * @author fabiojose
  *
  */
-public class HTTPHeaderMapper {
-	private HTTPHeaderMapper() {}
+public class HeaderMapper {
+	private HeaderMapper() {}
 
 	public static Map<String, Object> map(Map<String, String> attributes,
 			Map<String, String> extensions) {