diff --git a/aries/messages/src/msg_fields/protocols/cred_issuance/v2/issue_credential.rs b/aries/messages/src/msg_fields/protocols/cred_issuance/v2/issue_credential.rs
index 99c22e1de4..528124ccb8 100644
--- a/aries/messages/src/msg_fields/protocols/cred_issuance/v2/issue_credential.rs
+++ b/aries/messages/src/msg_fields/protocols/cred_issuance/v2/issue_credential.rs
@@ -43,8 +43,11 @@ pub struct IssueCredentialV2Decorators {
 pub enum IssueCredentialAttachmentFormatType {
     #[serde(rename = "aries/ld-proof-vc@v1.0")]
     AriesLdProofVc1_0,
-    #[serde(rename = "anoncreds/cred@v2.0")]
-    AnoncredsCredential2_0,
+    #[serde(
+        rename = "anoncreds/credential@v1.0",
+        alias = "anoncreds/cred@v2.0" // TODO - this is wrong, fix once acapy fixes
+    )]
+    AnoncredsCredential1_0,
     #[serde(rename = "hlindy/cred@v2.0")]
     HyperledgerIndyCredential2_0,
 }
diff --git a/aries/messages/src/msg_fields/protocols/cred_issuance/v2/offer_credential.rs b/aries/messages/src/msg_fields/protocols/cred_issuance/v2/offer_credential.rs
index 3f42354653..413898845a 100644
--- a/aries/messages/src/msg_fields/protocols/cred_issuance/v2/offer_credential.rs
+++ b/aries/messages/src/msg_fields/protocols/cred_issuance/v2/offer_credential.rs
@@ -45,8 +45,12 @@ pub enum OfferCredentialAttachmentFormatType {
     DifCredentialManifest1_0,
     #[serde(rename = "hlindy/cred-abstract@v2.0")]
     HyperledgerIndyCredentialAbstract2_0,
-    #[serde(rename = "anoncreds/cred-abstract@v2.0")]
-    AnoncredsCredentialAbstract2_0,
+    #[serde(
+        rename = "anoncreds/credential-offer@v1.0",
+        alias = "anoncreds/cred-abstract@v2.0", // TODO - remove after acapy fix
+        alias = "anoncreds/credential@v1.0" // TODO - remove after credo-ts fix
+    )]
+    AnoncredsCredentialOffer1_0,
     #[serde(rename = "aries/ld-proof-vc-detail@v1.0")]
     AriesLdProofVcDetail1_0,
 }
diff --git a/aries/messages/src/msg_fields/protocols/cred_issuance/v2/propose_credential.rs b/aries/messages/src/msg_fields/protocols/cred_issuance/v2/propose_credential.rs
index f71cfd3630..3a5d8282dc 100644
--- a/aries/messages/src/msg_fields/protocols/cred_issuance/v2/propose_credential.rs
+++ b/aries/messages/src/msg_fields/protocols/cred_issuance/v2/propose_credential.rs
@@ -44,8 +44,12 @@ pub enum ProposeCredentialAttachmentFormatType {
     DifCredentialManifest1_0,
     #[serde(rename = "aries/ld-proof-vc-detail@v1.0")]
     AriesLdProofVcDetail1_0,
-    #[serde(rename = "anoncreds/cred-filter@v2.0")]
-    AnoncredCredentialFilter2_0,
+    #[serde(
+        rename = "anoncreds/credential-filter@v1.0",
+        // TODO - this is wrong, fix once acapy fixes
+        alias = "anoncreds/cred-filter@v2.0"
+    )]
+    AnoncredCredentialFilter1_0,
     #[serde(rename = "hlindy/cred-filter@v2.0")]
     HyperledgerIndyCredentialFilter2_0,
 }
diff --git a/aries/messages/src/msg_fields/protocols/cred_issuance/v2/request_credential.rs b/aries/messages/src/msg_fields/protocols/cred_issuance/v2/request_credential.rs
index 933523c54d..1cefa9c2ed 100644
--- a/aries/messages/src/msg_fields/protocols/cred_issuance/v2/request_credential.rs
+++ b/aries/messages/src/msg_fields/protocols/cred_issuance/v2/request_credential.rs
@@ -40,8 +40,12 @@ pub enum RequestCredentialAttachmentFormatType {
     DifCredentialManifest1_0,
     #[serde(rename = "hlindy/cred-req@v2.0")]
     HyperledgerIndyCredentialRequest2_0,
-    #[serde(rename = "anoncreds/cred-req@v2.0")]
-    AnoncredsCredentialRequest2_0,
+    #[serde(
+        rename = "anoncreds/credential-request@v1.0",
+        // TODO - this is wrong, fix once acapy fixes
+        alias = "anoncreds/cred-req@v2.0",
+    )]
+    AnoncredsCredentialRequest1_0,
     #[serde(rename = "aries/ld-proof-vc-detail@v1.0")]
     AriesLdProofVcDetail1_0,
 }
diff --git a/aries/messages/src/msg_fields/protocols/present_proof/v2/present.rs b/aries/messages/src/msg_fields/protocols/present_proof/v2/present.rs
index 473f77e135..43179185a4 100644
--- a/aries/messages/src/msg_fields/protocols/present_proof/v2/present.rs
+++ b/aries/messages/src/msg_fields/protocols/present_proof/v2/present.rs
@@ -42,9 +42,12 @@ pub struct PresentationV2Decorators {
 pub enum PresentationAttachmentFormatType {
     #[serde(rename = "hlindy/proof@v2.0")]
     HyperledgerIndyProof2_0,
-    // TODO - FIX - wrong ver, match acapy
-    #[serde(rename = "anoncreds/proof@v2.0")]
-    AnoncredsProof2_0,
+    #[serde(
+        rename = "anoncreds/proof@v1.0",
+        // TODO - FIX - wrong ver, match acapy
+        alias = "anoncreds/proof@v2.0"
+    )]
+    AnoncredsProof1_0,
     #[serde(rename = "dif/presentation-exchange/submission@v1.0")]
     DifPresentationExchangeSubmission1_0,
 }
diff --git a/aries/messages/src/msg_fields/protocols/present_proof/v2/propose.rs b/aries/messages/src/msg_fields/protocols/present_proof/v2/propose.rs
index 0e2adc3e1a..e2c2f539b2 100644
--- a/aries/messages/src/msg_fields/protocols/present_proof/v2/propose.rs
+++ b/aries/messages/src/msg_fields/protocols/present_proof/v2/propose.rs
@@ -43,9 +43,12 @@ pub enum ProposePresentationAttachmentFormatType {
     DifPresentationExchangeDefinitions1_0,
     #[serde(rename = "hlindy/proof-req@v2.0")]
     HyperledgerIndyProofRequest2_0,
-    // TODO - FIX - wrong ver, match acapy
-    #[serde(rename = "anoncreds/proof-req@v2.0")]
-    AnoncredsProofRequest2_0,
+    #[serde(
+        rename = "anoncreds/proof-request@v1.0",
+        // TODO - FIX - wrong ver, match acapy
+        alias = "anoncreds/proof-req@v2.0"
+    )]
+    AnoncredsProofRequest1_0,
 }
 
 #[cfg(test)]
diff --git a/aries/messages/src/msg_fields/protocols/present_proof/v2/request.rs b/aries/messages/src/msg_fields/protocols/present_proof/v2/request.rs
index 5dd52b9a27..3b677dea3b 100644
--- a/aries/messages/src/msg_fields/protocols/present_proof/v2/request.rs
+++ b/aries/messages/src/msg_fields/protocols/present_proof/v2/request.rs
@@ -44,9 +44,12 @@ pub struct RequestPresentationV2Decorators {
 pub enum PresentationRequestAttachmentFormatType {
     #[serde(rename = "hlindy/proof-req@v2.0")]
     HyperledgerIndyProofRequest2_0,
-    // TODO - FIX - wrong ver, match acapy
-    #[serde(rename = "anoncreds/proof-req@v2.0")]
-    AnoncredsProofRequest2_0,
+    #[serde(
+        rename = "anoncreds/proof-request@v1.0",
+        // TODO - FIX - wrong ver, match acapy
+        alias = "anoncreds/proof-req@v2.0"
+    )]
+    AnoncredsProofRequest1_0,
     #[serde(rename = "dif/presentation-exchange/definitions@v1.0")]
     DifPresentationExchangeDefinitions1_0,
 }