diff --git a/draft/application/cms/cms-safe.ecf b/draft/application/cms/cms-safe.ecf
index d8aac19c..6766f70c 100644
--- a/draft/application/cms/cms-safe.ecf
+++ b/draft/application/cms/cms-safe.ecf
@@ -23,7 +23,7 @@
 		<library name="wsf" location="..\..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
 		<library name="wsf_html" location="..\..\..\library\server\wsf_html\wsf_html-safe.ecf" readonly="false"/>
 		<library name="wsf_session" location="..\..\..\library\server\wsf\wsf_session-safe.ecf" readonly="false"/>
-		<library name="notification" location="..\..\..\library\runtime\process\notification\notification-safe.ecf"/>
+		<library name="notification_email" location="..\..\..\library\runtime\process\notification_email\notification_email-safe.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true"/>
 	</target>
 </system>
diff --git a/draft/application/cms/cms.ecf b/draft/application/cms/cms.ecf
index 7f9d4f4c..164e5649 100644
--- a/draft/application/cms/cms.ecf
+++ b/draft/application/cms/cms.ecf
@@ -24,7 +24,7 @@
 		<library name="uri_template" location="..\..\..\library\text\parser\uri_template\uri_template.ecf"/>
 		<library name="wsf" location="..\..\..\library\server\wsf\wsf.ecf" readonly="false"/>
 		<library name="wsf_session" location="..\..\..\library\server\wsf\wsf_session.ecf" readonly="false"/>
-		<library name="notification" location="..\..\..\library\runtime\process\notification\notification.ecf"/>
+		<library name="notification_email" location="..\..\..\library\runtime\process\notification_email\notification_email.ecf"/>
 		<cluster name="src" location=".\src\" recursive="true">
 		</cluster>
 	</target>
diff --git a/library/runtime/process/notification/notification_chain_mailer.e b/library/runtime/process/notification_email/notification_chain_mailer.e
similarity index 100%
rename from library/runtime/process/notification/notification_chain_mailer.e
rename to library/runtime/process/notification_email/notification_chain_mailer.e
diff --git a/library/runtime/process/notification/notification-safe.ecf b/library/runtime/process/notification_email/notification_email-safe.ecf
similarity index 86%
rename from library/runtime/process/notification/notification-safe.ecf
rename to library/runtime/process/notification_email/notification_email-safe.ecf
index 7e254312..8bf4ed88 100644
--- a/library/runtime/process/notification/notification-safe.ecf
+++ b/library/runtime/process/notification_email/notification_email-safe.ecf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="notification" uuid="99D9A065-CD45-4E20-9C86-579C8AD42E5E" library_target="notification">
-	<target name="notification">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="notification_email" uuid="99D9A065-CD45-4E20-9C86-579C8AD42E5E" library_target="notification_email">
+	<target name="notification_email">
 		<root all_classes="true"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
diff --git a/library/runtime/process/notification/notification_email.e b/library/runtime/process/notification_email/notification_email.e
similarity index 100%
rename from library/runtime/process/notification/notification_email.e
rename to library/runtime/process/notification_email/notification_email.e
diff --git a/library/runtime/process/notification/notification.ecf b/library/runtime/process/notification_email/notification_email.ecf
similarity index 85%
rename from library/runtime/process/notification/notification.ecf
rename to library/runtime/process/notification_email/notification_email.ecf
index cf3757f1..80db0f22 100644
--- a/library/runtime/process/notification/notification.ecf
+++ b/library/runtime/process/notification_email/notification_email.ecf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="notification" uuid="99D9A065-CD45-4E20-9C86-579C8AD42E5E" library_target="notification">
-	<target name="notification">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="notification_email" uuid="99D9A065-CD45-4E20-9C86-579C8AD42E5E" library_target="notification_email">
+	<target name="notification_email">
 		<root all_classes="true"/>
 		<file_rule>
 			<exclude>/.git$</exclude>
diff --git a/library/runtime/process/notification/notification_external_mailer.e b/library/runtime/process/notification_email/notification_external_mailer.e
similarity index 100%
rename from library/runtime/process/notification/notification_external_mailer.e
rename to library/runtime/process/notification_email/notification_external_mailer.e
diff --git a/library/runtime/process/notification/notification_mailer.e b/library/runtime/process/notification_email/notification_mailer.e
similarity index 100%
rename from library/runtime/process/notification/notification_mailer.e
rename to library/runtime/process/notification_email/notification_mailer.e
diff --git a/library/runtime/process/notification/notification_sendmail_mailer.e b/library/runtime/process/notification_email/notification_sendmail_mailer.e
similarity index 100%
rename from library/runtime/process/notification/notification_sendmail_mailer.e
rename to library/runtime/process/notification_email/notification_sendmail_mailer.e