diff --git a/doc/org.bluez.MediaEndpoint.rst b/doc/org.bluez.MediaEndpoint.rst
index bbe00b6..c1ce1d5 100644
--- a/doc/org.bluez.MediaEndpoint.rst
+++ b/doc/org.bluez.MediaEndpoint.rst
@@ -69,11 +69,11 @@ Possible errors for A2DP endpoints:
 	:org.bluez.Error.A2DP.NotSupportedMinimumBitpoolValue:
 	:org.bluez.Error.A2DP.InvalidMaximumBitpoolValue:
 	:org.bluez.Error.A2DP.NotSupportedMaximumBitpoolValue:
-	:org.bluez.Error.A2DP.InvalidInvalidLayer:
+	:org.bluez.Error.A2DP.InvalidLayer:
 	:org.bluez.Error.A2DP.NotSupportedLayer:
-	:org.bluez.Error.A2DP.NotSupporterdCRC:
-	:org.bluez.Error.A2DP.NotSupporterdMPF:
-	:org.bluez.Error.A2DP.NotSupporterdVBR:
+	:org.bluez.Error.A2DP.NotSupportedCRC:
+	:org.bluez.Error.A2DP.NotSupportedMPF:
+	:org.bluez.Error.A2DP.NotSupportedVBR:
 	:org.bluez.Error.A2DP.InvalidBitRate:
 	:org.bluez.Error.A2DP.NotSupportedBitRate:
 	:org.bluez.Error.A2DP.InvalidObjectType:
diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index 661843a..6661a95 100644
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
@@ -183,11 +183,11 @@ static struct a2dp_error config_errors[] = {
 	{"InvalidMaximumBitpoolValue", A2DP_INVALID_MAXIMUM_BITPOOL_VALUE},
 	{"NotSupportedMaximumBitpoolValue",
 				A2DP_NOT_SUPPORTED_MAXIMUM_BITPOOL_VALUE},
-	{"InvalidInvalidLayer", A2DP_INVALID_INVALID_LAYER},
+	{"InvalidLayer", A2DP_INVALID_LAYER},
 	{"NotSupportedLayer", A2DP_NOT_SUPPORTED_LAYER},
-	{"NotSupporterdCRC", A2DP_NOT_SUPPORTERD_CRC},
-	{"NotSupporterdMPF", A2DP_NOT_SUPPORTERD_MPF},
-	{"NotSupporterdVBR", A2DP_NOT_SUPPORTERD_VBR},
+	{"NotSupportedCRC", A2DP_NOT_SUPPORTED_CRC},
+	{"NotSupportedMPF", A2DP_NOT_SUPPORTED_MPF},
+	{"NotSupportedVBR", A2DP_NOT_SUPPORTED_VBR},
 	{"InvalidBitRate", A2DP_INVALID_BIT_RATE},
 	{"NotSupportedBitRate", A2DP_NOT_SUPPORTED_BIT_RATE},
 	{"InvalidObjectType", A2DP_INVALID_OBJECT_TYPE},
diff --git a/profiles/audio/a2dp.h b/profiles/audio/a2dp.h
index bcdb4d4..e742b5d 100644
--- a/profiles/audio/a2dp.h
+++ b/profiles/audio/a2dp.h
@@ -102,11 +102,11 @@ enum a2dp_error_codes {
 	A2DP_NOT_SUPPORTED_MINIMUM_BITPOOL_VALUE = 0xcc,
 	A2DP_INVALID_MAXIMUM_BITPOOL_VALUE = 0xcd,
 	A2DP_NOT_SUPPORTED_MAXIMUM_BITPOOL_VALUE = 0xce,
-	A2DP_INVALID_INVALID_LAYER = 0xcf,
+	A2DP_INVALID_LAYER = 0xcf,
 	A2DP_NOT_SUPPORTED_LAYER = 0xd0,
-	A2DP_NOT_SUPPORTERD_CRC = 0xd1,
-	A2DP_NOT_SUPPORTERD_MPF = 0xd2,
-	A2DP_NOT_SUPPORTERD_VBR = 0xd3,
+	A2DP_NOT_SUPPORTED_CRC = 0xd1,
+	A2DP_NOT_SUPPORTED_MPF = 0xd2,
+	A2DP_NOT_SUPPORTED_VBR = 0xd3,
 	A2DP_INVALID_BIT_RATE = 0xd4,
 	A2DP_NOT_SUPPORTED_BIT_RATE = 0xd5,
 	A2DP_INVALID_OBJECT_TYPE = 0xd6,