diff --git a/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml b/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml
index 4453342d6..6c5b76a70 100644
--- a/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml
+++ b/adyenv6backoffice/resources/adyenv6backoffice-backoffice-config.xml
@@ -86,43 +86,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/adyenv6backoffice/resources/localization/adyenv6backoffice-locales_en.properties b/adyenv6backoffice/resources/localization/adyenv6backoffice-locales_en.properties
index dbf082166..1b13259fd 100644
--- a/adyenv6backoffice/resources/localization/adyenv6backoffice-locales_en.properties
+++ b/adyenv6backoffice/resources/localization/adyenv6backoffice-locales_en.properties
@@ -26,7 +26,4 @@
# type..description=XY
# type...description=XY
#
-# yourcustomlocalekey=value
-
-hmc_adyen_notification=Adyen Notification
-
+# yourcustomlocalekey=value
\ No newline at end of file
diff --git a/adyenv6core/resources/adyenv6core-items.xml b/adyenv6core/resources/adyenv6core-items.xml
index 4e3d83486..af5d91ce1 100644
--- a/adyenv6core/resources/adyenv6core-items.xml
+++ b/adyenv6core/resources/adyenv6core-items.xml
@@ -541,7 +541,7 @@
-
+
diff --git a/adyenv6core/resources/localization/adyenv6core-locales_en.properties b/adyenv6core/resources/localization/adyenv6core-locales_en.properties
index a05ab8535..33ee59893 100644
--- a/adyenv6core/resources/localization/adyenv6core-locales_en.properties
+++ b/adyenv6core/resources/localization/adyenv6core-locales_en.properties
@@ -129,20 +129,3 @@ type.AmazonpayEnvironment.LIVE.name=LIVE
type.AmazonpayRegion.EU.name=EU
type.AmazonpayRegion.NA.name=NA
type.AmazonpayRegion.JP.name=JP
-
-type.NotificationItem.name=Adyen Notification
-type.NotificationItem.uuid.name=UUID
-type.NotificationItem.amountValue.name=Amount value
-type.NotificationItem.amountCurrency.name=Amount currency
-type.NotificationItem.eventCode.name=Event code
-type.NotificationItem.eventDate.name=Event date
-type.NotificationItem.merchantAccountCode.name=Merchant account code
-type.NotificationItem.merchantReference.name=Merchant reference
-type.NotificationItem.originalReference.name=Original reference
-type.NotificationItem.pspReference.name=PSP reference
-type.NotificationItem.reason.name=Reason
-type.NotificationItem.success.name=Success
-type.NotificationItem.paymentMethod.name=Payment method
-type.NotificationItem.additionalData.name=Additional data
-type.NotificationItem.createdAt.name=Created at
-type.NotificationItem.processedAt.name=Processed at
\ No newline at end of file
diff --git a/adyenv6notification/extensioninfo.xml b/adyenv6notification/extensioninfo.xml
index 4abaa4353..48aca035c 100644
--- a/adyenv6notification/extensioninfo.xml
+++ b/adyenv6notification/extensioninfo.xml
@@ -20,6 +20,8 @@
+
+
\ No newline at end of file
diff --git a/adyenv6notification/resources/adyenv6notification-backoffice-config.xml b/adyenv6notification/resources/adyenv6notification-backoffice-config.xml
new file mode 100644
index 000000000..39f64b048
--- /dev/null
+++ b/adyenv6notification/resources/adyenv6notification-backoffice-config.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/adyenv6notification/resources/localization/adyenv6notification-locales_en.properties b/adyenv6notification/resources/localization/adyenv6notification-locales_en.properties
new file mode 100644
index 000000000..313f197e1
--- /dev/null
+++ b/adyenv6notification/resources/localization/adyenv6notification-locales_en.properties
@@ -0,0 +1,39 @@
+# -----------------------------------------------------------------------
+# Copyright (c) 2021 SAP SE or an SAP affiliate company. All rights reserved.
+# -----------------------------------------------------------------------
+
+# put localizations of item types into this file
+# Note that you can also add special locatizations which
+# can be retrieved with the
+#
+# ...tools.localization.Localization.getLocalizedString(...)
+#
+# methods.
+#
+# syntax for type localizations:
+#
+# type..name=XY
+# type...name=XY
+# type..description=XY
+# type...description=XY
+#
+# yourcustomlocalekey=value
+hmc_adyen_notification_item=Adyen Notification Item
+
+type.NotificationItem.name=Adyen Notification
+type.NotificationItem.uuid.name=UUID
+type.NotificationItem.amountValue.name=Amount value
+type.NotificationItem.amountCurrency.name=Amount currency
+type.NotificationItem.eventCode.name=Event code
+type.NotificationItem.eventDate.name=Event date
+type.NotificationItem.merchantAccountCode.name=Merchant account code
+type.NotificationItem.merchantReference.name=Merchant reference
+type.NotificationItem.originalReference.name=Original reference
+type.NotificationItem.pspReference.name=PSP reference
+type.NotificationItem.reason.name=Reason
+type.NotificationItem.success.name=Success
+type.NotificationItem.paymentMethod.name=Payment method
+type.NotificationItem.additionalData.name=Additional data
+type.NotificationItem.createdAt.name=Created at
+type.NotificationItem.processedAt.name=Processed at
+
diff --git a/adyenv6notificationv2/extensioninfo.xml b/adyenv6notificationv2/extensioninfo.xml
index 637232b7e..ac5dda49d 100644
--- a/adyenv6notificationv2/extensioninfo.xml
+++ b/adyenv6notificationv2/extensioninfo.xml
@@ -9,14 +9,14 @@
-
-
+
+
diff --git a/adyenv6notificationv2/project.properties b/adyenv6notificationv2/project.properties
index ce547cd06..d16db9c92 100644
--- a/adyenv6notificationv2/project.properties
+++ b/adyenv6notificationv2/project.properties
@@ -7,4 +7,4 @@
# Specifies the location of the spring context file putted automatically to the global platform application context.
adyenv6notificationv2.application-context=adyenv6notificationv2-spring.xml
-adyenv6notification.webroot=/adyenv6notificationv2
\ No newline at end of file
+adyenv6notificationv2.webroot=/adyenv6notificationv2
\ No newline at end of file
diff --git a/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-config.xml b/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-config.xml
new file mode 100644
index 000000000..b0d6181b8
--- /dev/null
+++ b/adyenv6notificationv2/resources/adyenv6notificationv2-backoffice-config.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/adyenv6notificationv2/resources/localization/adyenv6notificationv2-locales_en.properties b/adyenv6notificationv2/resources/localization/adyenv6notificationv2-locales_en.properties
index e5a68631c..e8c80455c 100644
--- a/adyenv6notificationv2/resources/localization/adyenv6notificationv2-locales_en.properties
+++ b/adyenv6notificationv2/resources/localization/adyenv6notificationv2-locales_en.properties
@@ -18,4 +18,22 @@
# type...description=XY
#
# yourcustomlocalekey=value
+hmc_adyen_notification=Adyen Notification
+
+type.AdyenNotification.name=Adyen Notification
+type.AdyenNotification.uuid.name=UUID
+type.AdyenNotification.amountValue.name=Amount value
+type.AdyenNotification.amountCurrency.name=Amount currency
+type.AdyenNotification.eventCode.name=Event code
+type.AdyenNotification.eventDate.name=Event date
+type.AdyenNotification.merchantAccountCode.name=Merchant account code
+type.AdyenNotification.merchantReference.name=Merchant reference
+type.AdyenNotification.originalReference.name=Original reference
+type.AdyenNotification.pspReference.name=PSP reference
+type.AdyenNotification.reason.name=Reason
+type.AdyenNotification.success.name=Success
+type.AdyenNotification.paymentMethod.name=Payment method
+type.AdyenNotification.additionalData.name=Additional data
+type.AdyenNotification.createdAt.name=Created at
+type.AdyenNotification.processedAt.name=Processed at