diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/given/text_message_received_events_containing_aggregated_case_reports.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/given/text_message_received_events_containing_aggregated_case_reports.cs
similarity index 97%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/given/text_message_received_events_containing_aggregated_case_reports.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/given/text_message_received_events_containing_aggregated_case_reports.cs
index a88a62b46..96de30cd2 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/given/text_message_received_events_containing_aggregated_case_reports.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/given/text_message_received_events_containing_aggregated_case_reports.cs
@@ -3,12 +3,9 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
-using Policies.Reporting.Notifications;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.given
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.given
 {
     public class text_message_received_events_containing_aggregated_case_reports : Policies.Specs.Reporting.for_notifications.given.text_message_received_events
     {
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/given/text_message_received_events_containing_aggregated_case_report_separated_by_hash.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/given/text_message_received_events_containing_aggregated_case_report.cs
similarity index 86%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/given/text_message_received_events_containing_aggregated_case_report_separated_by_hash.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/given/text_message_received_events_containing_aggregated_case_report.cs
index 986218289..0ae85a1f3 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/given/text_message_received_events_containing_aggregated_case_report_separated_by_hash.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/given/text_message_received_events_containing_aggregated_case_report.cs
@@ -3,15 +3,12 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
-using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_hash.given
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash.given
 {
-    public class text_message_received_events_containing_aggregated_case_report_separated_by_hash : Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.
-        given.text_message_received_events_containing_aggregated_case_reports
+    public class text_message_received_events_containing_aggregated_case_report : text_message_received_events_containing_aggregated_case_reports
     {
         static readonly char separator = '#';
         protected static TextMessageReceived valid_text_message_received(int males_under_5, int males_over_5, int females_under_5, int females_over_5 ) => valid_text_message_received(males_under_5, males_over_5, females_under_5, females_over_5, separator);
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_it_is_a_valid_report.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_it_is_a_valid_report.cs
similarity index 88%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_it_is_a_valid_report.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_it_is_a_valid_report.cs
index 62223265d..13bddd2bc 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_it_is_a_valid_report.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_it_is_a_valid_report.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_it_is_a_valid_report : given.text_message_received_events_containing_aggregated_case_report_separated_by_hash
+    public class when_it_is_a_valid_report : text_message_received_events_containing_aggregated_case_report
     {
         static readonly int cases_of_male_under_5 = 0;
         static readonly int cases_of_male_over_5 = 1;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_a_negative_health_risk.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_a_negative_health_risk.cs
similarity index 82%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_a_negative_health_risk.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_a_negative_health_risk.cs
index 6c82aa798..09eea281b 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_a_negative_health_risk.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_a_negative_health_risk.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_health_risk : given.text_message_received_events_containing_aggregated_case_report_separated_by_star
+    public class when_report_has_a_negative_health_risk : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_females_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_a_negative_number_of_cases_of_females_over_5.cs
similarity index 85%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_females_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_a_negative_number_of_cases_of_females_over_5.cs
index b52a7ce9e..aff511784 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_females_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_a_negative_number_of_cases_of_females_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_number_of_cases_of_females_over_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star_and_hash
+    public class when_report_has_a_negative_number_of_cases_of_females_over_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_a_negative_number_of_cases_of_females_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_a_negative_number_of_cases_of_females_under_5.cs
similarity index 85%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_a_negative_number_of_cases_of_females_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_a_negative_number_of_cases_of_females_under_5.cs
index b73f804f2..46726708b 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_a_negative_number_of_cases_of_females_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_a_negative_number_of_cases_of_females_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_number_of_cases_of_females_under_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_hash
+    public class when_report_has_a_negative_number_of_cases_of_females_under_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_a_negative_number_of_cases_of_males_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_a_negative_number_of_cases_of_males_over_5.cs
similarity index 85%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_a_negative_number_of_cases_of_males_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_a_negative_number_of_cases_of_males_over_5.cs
index b1ea38843..1700c74e0 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_a_negative_number_of_cases_of_males_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_a_negative_number_of_cases_of_males_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_number_of_cases_of_males_over_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star
+    public class when_report_has_a_negative_number_of_cases_of_males_over_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_males_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_a_negative_number_of_cases_of_males_under_5.cs
similarity index 85%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_males_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_a_negative_number_of_cases_of_males_under_5.cs
index e98135c3a..ed3fbffdf 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_males_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_a_negative_number_of_cases_of_males_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_number_of_cases_of_males_under_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star_and_hash
+    public class when_report_has_a_negative_number_of_cases_of_males_under_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_an_invalid_value_for_females_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_females_over_5.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_an_invalid_value_for_females_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_females_over_5.cs
index 9df9e1a7f..9be1e8219 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_an_invalid_value_for_females_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_females_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_females_over_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star
+    public class when_report_has_an_invalid_value_for_females_over_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_an_invalid_value_for_females_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_females_under_5.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_an_invalid_value_for_females_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_females_under_5.cs
index 115abaf32..5f075c4f7 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_an_invalid_value_for_females_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_females_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_females_under_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_hash
+    public class when_report_has_an_invalid_value_for_females_under_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_an_invalid_value_for_health_risk.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_health_risk.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_an_invalid_value_for_health_risk.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_health_risk.cs
index 10e453aaf..2bf142291 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_an_invalid_value_for_health_risk.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_health_risk.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_health_risk : given.text_message_received_events_containing_aggregated_case_report_separated_by_star
+    public class when_report_has_an_invalid_value_for_health_risk : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_an_invalid_value_for_males_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_males_over_5.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_an_invalid_value_for_males_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_males_over_5.cs
index 0cf0e73ab..91886f99b 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_an_invalid_value_for_males_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_males_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_males_over_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star
+    public class when_report_has_an_invalid_value_for_males_over_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_an_invalid_value_for_males_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_males_under_5.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_an_invalid_value_for_males_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_males_under_5.cs
index 42e4f628d..4475c1d07 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_an_invalid_value_for_males_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_males_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_males_under_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_hash
+    public class when_report_has_an_invalid_value_for_males_under_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/given/text_message_received_events_containing_aggregated_case_report_separated_by_star.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/given/text_message_received_events_containing_aggregated_case_report.cs
similarity index 86%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/given/text_message_received_events_containing_aggregated_case_report_separated_by_star.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/given/text_message_received_events_containing_aggregated_case_report.cs
index 6335aaafd..253b8b552 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/given/text_message_received_events_containing_aggregated_case_report_separated_by_star.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/given/text_message_received_events_containing_aggregated_case_report.cs
@@ -3,15 +3,12 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
-using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star.given
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star.given
 {
-    public class text_message_received_events_containing_aggregated_case_report_separated_by_star : Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.
-        given.text_message_received_events_containing_aggregated_case_reports
+    public class text_message_received_events_containing_aggregated_case_report : text_message_received_events_containing_aggregated_case_reports
     {
         static readonly char separator = '*';
         protected static TextMessageReceived valid_text_message_received(int males_under_5, int males_over_5, int females_under_5, int females_over_5 ) => valid_text_message_received(males_under_5, males_over_5, females_under_5, females_over_5, separator);
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_it_is_a_valid_report.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_it_is_a_valid_report.cs
similarity index 88%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_it_is_a_valid_report.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_it_is_a_valid_report.cs
index e8add22db..a6b3329aa 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_it_is_a_valid_report.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_it_is_a_valid_report.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_it_is_a_valid_report : given.text_message_received_events_containing_aggregated_case_report_separated_by_star
+    public class when_it_is_a_valid_report : text_message_received_events_containing_aggregated_case_report
     {
         static readonly int cases_of_male_under_5 = 0;
         static readonly int cases_of_male_over_5 = 1;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_a_negative_health_risk.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_a_negative_health_risk.cs
similarity index 82%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_a_negative_health_risk.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_a_negative_health_risk.cs
index 46718de4b..69c1d7845 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_a_negative_health_risk.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_a_negative_health_risk.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_health_risk : given.text_message_received_events_containing_aggregated_case_report_separated_by_star_and_hash
+    public class when_report_has_a_negative_health_risk : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_a_negative_number_of_cases_of_females_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_a_negative_number_of_cases_of_females_over_5.cs
similarity index 85%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_a_negative_number_of_cases_of_females_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_a_negative_number_of_cases_of_females_over_5.cs
index 1eda815f9..b98cbf534 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_a_negative_number_of_cases_of_females_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_a_negative_number_of_cases_of_females_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_number_of_cases_of_females_over_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star
+    public class when_report_has_a_negative_number_of_cases_of_females_over_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_females_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_a_negative_number_of_cases_of_females_under_5.cs
similarity index 85%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_females_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_a_negative_number_of_cases_of_females_under_5.cs
index 556d8226c..7a871976e 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_females_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_a_negative_number_of_cases_of_females_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_number_of_cases_of_females_under_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star_and_hash
+    public class when_report_has_a_negative_number_of_cases_of_females_under_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_a_negative_number_of_cases_of_males_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_a_negative_number_of_cases_of_males_over_5.cs
similarity index 85%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_a_negative_number_of_cases_of_males_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_a_negative_number_of_cases_of_males_over_5.cs
index e8a56bc01..5bfac95c0 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_a_negative_number_of_cases_of_males_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_a_negative_number_of_cases_of_males_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_number_of_cases_of_males_over_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_hash
+    public class when_report_has_a_negative_number_of_cases_of_males_over_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_a_negative_number_of_cases_of_males_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_a_negative_number_of_cases_of_males_under_5.cs
similarity index 85%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_a_negative_number_of_cases_of_males_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_a_negative_number_of_cases_of_males_under_5.cs
index bcc9e1542..d381a08a5 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_a_negative_number_of_cases_of_males_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_a_negative_number_of_cases_of_males_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_number_of_cases_of_males_under_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star
+    public class when_report_has_a_negative_number_of_cases_of_males_under_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_females_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_females_over_5.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_females_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_females_over_5.cs
index e0798b4ed..09f3a8783 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_females_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_females_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_females_over_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star_and_hash
+    public class when_report_has_an_invalid_value_for_females_over_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_an_invalid_value_for_females_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_females_under_5.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_an_invalid_value_for_females_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_females_under_5.cs
index 445c609e0..3b2b28b14 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_an_invalid_value_for_females_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_females_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_females_under_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star
+    public class when_report_has_an_invalid_value_for_females_under_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_an_invalid_value_for_health_risk.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_health_risk.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_an_invalid_value_for_health_risk.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_health_risk.cs
index 9e9bc9ce5..eab79f5e5 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_an_invalid_value_for_health_risk.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_health_risk.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_health_risk : given.text_message_received_events_containing_aggregated_case_report_separated_by_hash
+    public class when_report_has_an_invalid_value_for_health_risk : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_males_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_males_over_5.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_males_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_males_over_5.cs
index a28e87d24..a4246c8e3 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_males_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_males_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_males_over_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star_and_hash
+    public class when_report_has_an_invalid_value_for_males_over_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_an_invalid_value_for_males_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_males_under_5.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_an_invalid_value_for_males_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_males_under_5.cs
index 6baf54596..fddd1667e 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_an_invalid_value_for_males_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_males_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_males_under_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star
+    public class when_report_has_an_invalid_value_for_males_under_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/given/text_message_received_events_containing_aggregated_case_report_separated_by_star_and_hash.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/given/text_message_received_events_containing_aggregated_case_report.cs
similarity index 85%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/given/text_message_received_events_containing_aggregated_case_report_separated_by_star_and_hash.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/given/text_message_received_events_containing_aggregated_case_report.cs
index 9afedc80c..62d4a07b3 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/given/text_message_received_events_containing_aggregated_case_report_separated_by_star_and_hash.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/given/text_message_received_events_containing_aggregated_case_report.cs
@@ -3,15 +3,12 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
-using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star_and_hash.given
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash.given
 {
-    public class text_message_received_events_containing_aggregated_case_report_separated_by_star_and_hash : Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.
-        given.text_message_received_events_containing_aggregated_case_reports
+    public class text_message_received_events_containing_aggregated_case_report : text_message_received_events_containing_aggregated_case_reports
     {
         static readonly char? separator = null;
         protected static TextMessageReceived valid_text_message_received(int males_under_5, int males_over_5, int females_under_5, int females_over_5 ) => valid_text_message_received(males_under_5, males_over_5, females_under_5, females_over_5, separator);
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_it_is_a_valid_report.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_it_is_a_valid_report.cs
similarity index 88%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_it_is_a_valid_report.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_it_is_a_valid_report.cs
index b0dc046c3..9140a2797 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_it_is_a_valid_report.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_it_is_a_valid_report.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_it_is_a_valid_report : given.text_message_received_events_containing_aggregated_case_report_separated_by_star_and_hash
+    public class when_it_is_a_valid_report : text_message_received_events_containing_aggregated_case_report
     {
         static readonly int cases_of_male_under_5 = 0;
         static readonly int cases_of_male_over_5 = 1;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_a_negative_health_risk.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_health_risk.cs
similarity index 82%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_a_negative_health_risk.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_health_risk.cs
index 7142ccb98..0f58e944e 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_a_negative_health_risk.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_health_risk.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_health_risk : given.text_message_received_events_containing_aggregated_case_report_separated_by_hash
+    public class when_report_has_a_negative_health_risk : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_a_negative_number_of_cases_of_females_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_females_over_5.cs
similarity index 84%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_a_negative_number_of_cases_of_females_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_females_over_5.cs
index cb525aaf1..ae19e461f 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_a_negative_number_of_cases_of_females_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_females_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_number_of_cases_of_females_over_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_hash
+    public class when_report_has_a_negative_number_of_cases_of_females_over_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_a_negative_number_of_cases_of_females_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_females_under_5.cs
similarity index 84%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_a_negative_number_of_cases_of_females_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_females_under_5.cs
index 9e9922cb9..d00f1855d 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star/when_report_has_a_negative_number_of_cases_of_females_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_females_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_number_of_cases_of_females_under_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star
+    public class when_report_has_a_negative_number_of_cases_of_females_under_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_males_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_males_over_5.cs
similarity index 84%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_males_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_males_over_5.cs
index 953c21b36..10d554eaa 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_males_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_males_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_number_of_cases_of_males_over_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star_and_hash
+    public class when_report_has_a_negative_number_of_cases_of_males_over_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_a_negative_number_of_cases_of_males_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_males_under_5.cs
similarity index 84%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_a_negative_number_of_cases_of_males_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_males_under_5.cs
index 0963db038..6998a33a4 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_a_negative_number_of_cases_of_males_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_number_of_cases_of_males_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_number_of_cases_of_males_under_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_hash
+    public class when_report_has_a_negative_number_of_cases_of_males_under_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_an_invalid_value_for_females_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_females_over_5.cs
similarity index 82%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_an_invalid_value_for_females_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_females_over_5.cs
index 0df5a3ec2..aa527b2ec 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_an_invalid_value_for_females_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_females_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_females_over_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_hash
+    public class when_report_has_an_invalid_value_for_females_over_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_females_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_females_under_5.cs
similarity index 82%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_females_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_females_under_5.cs
index c150d8f95..88e974d93 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_females_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_females_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_females_under_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star_and_hash
+    public class when_report_has_an_invalid_value_for_females_under_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_health_risk.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_health_risk.cs
similarity index 82%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_health_risk.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_health_risk.cs
index abf1ab27b..006b61a15 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_health_risk.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_health_risk.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_health_risk : given.text_message_received_events_containing_aggregated_case_report_separated_by_star_and_hash
+    public class when_report_has_an_invalid_value_for_health_risk : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_an_invalid_value_for_males_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_males_over_5.cs
similarity index 82%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_an_invalid_value_for_males_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_males_over_5.cs
index 0a0179ba6..80b3928b2 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_hash/when_report_has_an_invalid_value_for_males_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_males_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_males_over_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_hash
+    public class when_report_has_an_invalid_value_for_males_over_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_males_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_males_under_5.cs
similarity index 82%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_males_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_males_under_5.cs
index 7a17a00f9..b47d4aca7 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_males_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_aggregated_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_males_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_aggregated_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_aggregated_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_males_under_5 : given.text_message_received_events_containing_aggregated_case_report_separated_by_star_and_hash
+    public class when_report_has_an_invalid_value_for_males_under_5 : text_message_received_events_containing_aggregated_case_report
     {        
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/given/a_text_message_received_builder_for_single_case_report.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/given/a_text_message_received_builder_for_single_case_report.cs
similarity index 97%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/given/a_text_message_received_builder_for_single_case_report.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/given/a_text_message_received_builder_for_single_case_report.cs
index 777b68688..2f58d96fc 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/given/a_text_message_received_builder_for_single_case_report.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/given/a_text_message_received_builder_for_single_case_report.cs
@@ -3,12 +3,9 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
-using Policies.Reporting.Notifications;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.given
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.given
 {
     public class a_text_message_received_builder_for_single_case_report : Policies.Specs.Reporting.for_notifications.given.text_message_received_events
     {
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/given/a_text_message_received_builder_for_single_case_report_separated_by_hash.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/given/a_text_message_received_builder_for_single_case_report.cs
similarity index 85%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/given/a_text_message_received_builder_for_single_case_report_separated_by_hash.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/given/a_text_message_received_builder_for_single_case_report.cs
index 4333c547b..66fb5549a 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/given/a_text_message_received_builder_for_single_case_report_separated_by_hash.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/given/a_text_message_received_builder_for_single_case_report.cs
@@ -3,15 +3,12 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
-using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_hash.given
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash.given
 {
-    public class a_text_message_received_builder_for_single_case_report_separated_by_hash : Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.
-        given.a_text_message_received_builder_for_single_case_report
+    public class a_text_message_received_builder_for_single_case_report : when_parsing_a_correctly_formated_single_case_report_sms.given.a_text_message_received_builder_for_single_case_report
     {
         static readonly char separator = '#';
         protected static TextMessageReceived valid_text_message_received(bool woman, bool under5) => valid_text_message_received(woman, under5, separator);
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_a_negative_age_group.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_a_negative_age_group.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_a_negative_age_group.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_a_negative_age_group.cs
index 8fe6fb5c9..326f89b40 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_a_negative_age_group.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_a_negative_age_group.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_age_group : given.a_text_message_received_builder_for_single_case_report_separated_by_star
+    public class when_report_has_a_negative_age_group : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_a_negative_health_risk.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_a_negative_health_risk.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_a_negative_health_risk.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_a_negative_health_risk.cs
index e3324ba68..482cbb171 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_a_negative_health_risk.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_a_negative_health_risk.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_health_risk : given.a_text_message_received_builder_for_single_case_report_separated_by_hash
+    public class when_report_has_a_negative_health_risk : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_a_negative_sex.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_a_negative_sex.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_a_negative_sex.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_a_negative_sex.cs
index d33bd1e33..b119f1e26 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_a_negative_sex.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_a_negative_sex.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_sex : given.a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash
+    public class when_report_has_a_negative_sex : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_an_invalid_value_for_age_group.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_age_group.cs
similarity index 84%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_an_invalid_value_for_age_group.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_age_group.cs
index 4c7ce1e83..3932e7544 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_an_invalid_value_for_age_group.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_age_group.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_age_group : given.a_text_message_received_builder_for_single_case_report_separated_by_hash
+    public class when_report_has_an_invalid_value_for_age_group : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_an_invalid_value_for_health_risk.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_health_risk.cs
similarity index 84%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_an_invalid_value_for_health_risk.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_health_risk.cs
index 22375c8f0..976231028 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_an_invalid_value_for_health_risk.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_health_risk.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class and_parsing_a_report_with_an_invalid_health_risk : given.a_text_message_received_builder_for_single_case_report_separated_by_hash
+    public class and_parsing_a_report_with_an_invalid_health_risk : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_an_invalid_value_for_sex.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_sex.cs
similarity index 80%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_an_invalid_value_for_sex.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_sex.cs
index ce5c909ae..0e42d6bc6 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_an_invalid_value_for_sex.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_an_invalid_value_for_sex.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class and_parsing_a_report_with_an_invalid_sex : given.a_text_message_received_builder_for_single_case_report_separated_by_star
+    public class and_parsing_a_report_with_an_invalid_sex : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_an_out_of_range_value_for_age_group.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_an_out_of_range_value_for_age_group.cs
similarity index 86%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_an_out_of_range_value_for_age_group.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_an_out_of_range_value_for_age_group.cs
index 74a87a6ee..eed4f4441 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_an_out_of_range_value_for_age_group.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_an_out_of_range_value_for_age_group.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_out_of_range_value_for_age_group : given.a_text_message_received_builder_for_single_case_report_separated_by_star
+    public class when_report_has_an_out_of_range_value_for_age_group : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_an_out_of_range_value_for_sex.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_an_out_of_range_value_for_sex.cs
similarity index 86%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_an_out_of_range_value_for_sex.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_an_out_of_range_value_for_sex.cs
index aabd73aae..0b0eaf56f 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_an_out_of_range_value_for_sex.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_has_an_out_of_range_value_for_sex.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_out_of_range_value_for_sex : given.a_text_message_received_builder_for_single_case_report_separated_by_hash
+    public class when_report_has_an_out_of_range_value_for_sex : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_is_of_a_man_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_is_of_a_man_over_5.cs
similarity index 87%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_is_of_a_man_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_is_of_a_man_over_5.cs
index 0fef51090..79190bb0b 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_is_of_a_man_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_is_of_a_man_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_is_of_a_man_over_5 : given.a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash
+    public class when_report_is_of_a_man_over_5 : a_text_message_received_builder_for_single_case_report
     {
         static readonly bool is_female = false;
         static readonly bool age_is_under_5 = false;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_is_of_a_man_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_is_of_a_man_under_5.cs
similarity index 88%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_is_of_a_man_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_is_of_a_man_under_5.cs
index 673d30df6..95da17b5a 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_is_of_a_man_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_is_of_a_man_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_is_of_a_man_under_5 : given.a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash
+    public class when_report_is_of_a_man_under_5 : a_text_message_received_builder_for_single_case_report
     {
         static readonly bool is_female = false;
         static readonly bool age_is_under_5 = true;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_is_of_a_woman_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_is_of_a_woman_over_5.cs
similarity index 87%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_is_of_a_woman_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_is_of_a_woman_over_5.cs
index 5f8b05898..8e947d4ca 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_is_of_a_woman_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_is_of_a_woman_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_is_of_a_woman_over_5 : given.a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash
+    public class when_report_is_of_a_woman_over_5 : a_text_message_received_builder_for_single_case_report
     {
         static readonly bool is_female = true;
         static readonly bool age_is_under_5 = false;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_is_of_a_woman_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_is_of_a_woman_under_5.cs
similarity index 87%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_is_of_a_woman_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_is_of_a_woman_under_5.cs
index 8d21fc5af..11e007f93 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_is_of_a_woman_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_hash/when_report_is_of_a_woman_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_hash
 {
     [Subject("Notification")]
-    public class when_report_is_of_a_woman_under_5 : given.a_text_message_received_builder_for_single_case_report_separated_by_hash
+    public class when_report_is_of_a_woman_under_5 : a_text_message_received_builder_for_single_case_report
     {
         static readonly bool is_female = true;
         static readonly bool age_is_under_5 = true;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/given/a_text_message_received_builder_for_single_case_report_separated_by_star.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/given/a_text_message_received_builder_for_single_case_report.cs
similarity index 85%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/given/a_text_message_received_builder_for_single_case_report_separated_by_star.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/given/a_text_message_received_builder_for_single_case_report.cs
index 00e56c2e2..ff90f66d9 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/given/a_text_message_received_builder_for_single_case_report_separated_by_star.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/given/a_text_message_received_builder_for_single_case_report.cs
@@ -3,15 +3,12 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
-using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star.given
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star.given
 {
-    public class a_text_message_received_builder_for_single_case_report_separated_by_star : Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.
-        given.a_text_message_received_builder_for_single_case_report
+    public class a_text_message_received_builder_for_single_case_report : when_parsing_a_correctly_formated_single_case_report_sms.given.a_text_message_received_builder_for_single_case_report
     {
         static readonly char separator = '*';
         protected static TextMessageReceived valid_text_message_received(bool woman, bool under5) => valid_text_message_received(woman, under5, separator);
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_a_negative_age_group.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_a_negative_age_group.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_a_negative_age_group.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_a_negative_age_group.cs
index 160e1c783..b8d114e96 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_a_negative_age_group.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_a_negative_age_group.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_age_group : given.a_text_message_received_builder_for_single_case_report_separated_by_hash
+    public class when_report_has_a_negative_age_group : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_a_negative_health_risk.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_a_negative_health_risk.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_a_negative_health_risk.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_a_negative_health_risk.cs
index 287b61195..c934f7176 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_a_negative_health_risk.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_a_negative_health_risk.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_health_risk : given.a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash
+    public class when_report_has_a_negative_health_risk : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_a_negative_sex.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_a_negative_sex.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_a_negative_sex.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_a_negative_sex.cs
index e48ba1eae..323363118 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_a_negative_sex.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_a_negative_sex.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_sex : given.a_text_message_received_builder_for_single_case_report_separated_by_hash
+    public class when_report_has_a_negative_sex : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_age_group.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_age_group.cs
similarity index 84%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_age_group.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_age_group.cs
index b1d054e37..9d114a6ac 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_age_group.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_age_group.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_age_group : given.a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash
+    public class when_report_has_an_invalid_value_for_age_group : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_an_invalid_value_for_health_risk.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_health_risk.cs
similarity index 84%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_an_invalid_value_for_health_risk.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_health_risk.cs
index 88c4d93a9..2706e2941 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_an_invalid_value_for_health_risk.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_health_risk.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class and_parsing_a_report_with_an_invalid_health_risk : given.a_text_message_received_builder_for_single_case_report_separated_by_star
+    public class and_parsing_a_report_with_an_invalid_health_risk : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_sex.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_sex.cs
similarity index 80%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_sex.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_sex.cs
index 754aa4220..8f40db0ac 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_sex.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_an_invalid_value_for_sex.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class and_parsing_a_report_with_an_invalid_sex : given.a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash
+    public class and_parsing_a_report_with_an_invalid_sex : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_an_out_of_range_value_for_age_group.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_an_out_of_range_value_for_age_group.cs
similarity index 86%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_an_out_of_range_value_for_age_group.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_an_out_of_range_value_for_age_group.cs
index 05dafdbdb..b32673c1a 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_an_out_of_range_value_for_age_group.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_an_out_of_range_value_for_age_group.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_an_out_of_range_value_for_age_group : given.a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash
+    public class when_report_has_an_out_of_range_value_for_age_group : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_an_out_of_range_value_for_sex.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_an_out_of_range_value_for_sex.cs
similarity index 86%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_an_out_of_range_value_for_sex.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_an_out_of_range_value_for_sex.cs
index d5a86c010..96060bfb8 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_an_out_of_range_value_for_sex.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_has_an_out_of_range_value_for_sex.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_has_an_out_of_range_value_for_sex : given.a_text_message_received_builder_for_single_case_report_separated_by_star
+    public class when_report_has_an_out_of_range_value_for_sex : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_is_of_a_man_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_is_of_a_man_over_5.cs
similarity index 87%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_is_of_a_man_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_is_of_a_man_over_5.cs
index 969bf4d9c..07044581b 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_is_of_a_man_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_is_of_a_man_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_is_of_a_man_over_5 : given.a_text_message_received_builder_for_single_case_report_separated_by_star
+    public class when_report_is_of_a_man_over_5 : a_text_message_received_builder_for_single_case_report
     {
         static readonly bool is_female = false;
         static readonly bool age_is_under_5 = false;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_is_of_a_man_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_is_of_a_man_under_5.cs
similarity index 88%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_is_of_a_man_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_is_of_a_man_under_5.cs
index 2ab967051..91e5cf516 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_is_of_a_man_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_is_of_a_man_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_is_of_a_man_under_5 : given.a_text_message_received_builder_for_single_case_report_separated_by_star
+    public class when_report_is_of_a_man_under_5 : a_text_message_received_builder_for_single_case_report
     {
         static readonly bool is_female = false;
         static readonly bool age_is_under_5 = true;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_is_of_a_woman_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_is_of_a_woman_over_5.cs
similarity index 87%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_is_of_a_woman_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_is_of_a_woman_over_5.cs
index dd6e80793..0245408b4 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_is_of_a_woman_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_is_of_a_woman_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_is_of_a_woman_over_5 : given.a_text_message_received_builder_for_single_case_report_separated_by_star
+    public class when_report_is_of_a_woman_over_5 : a_text_message_received_builder_for_single_case_report
     {
         static readonly bool is_female = true;
         static readonly bool age_is_under_5 = false;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_is_of_a_woman_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_is_of_a_woman_under_5.cs
similarity index 87%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_is_of_a_woman_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_is_of_a_woman_under_5.cs
index bac224732..79105e667 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_is_of_a_woman_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star/when_report_is_of_a_woman_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star
 {
     [Subject("Notification")]
-    public class when_report_is_of_a_woman_under_5 : given.a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash
+    public class when_report_is_of_a_woman_under_5 : a_text_message_received_builder_for_single_case_report
     {
         static readonly bool is_female = true;
         static readonly bool age_is_under_5 = true;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/given/a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/given/a_text_message_received_builder_for_single_case_report.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/given/a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/given/a_text_message_received_builder_for_single_case_report.cs
index fe9bad6cd..d6a669c39 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/given/a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/given/a_text_message_received_builder_for_single_case_report.cs
@@ -3,15 +3,12 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
-using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star_and_hash.given
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash.given
 {
-    public class a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash : Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.
-        given.a_text_message_received_builder_for_single_case_report
+    public class a_text_message_received_builder_for_single_case_report : when_parsing_a_correctly_formated_single_case_report_sms.given.a_text_message_received_builder_for_single_case_report
     {
         protected static TextMessageReceived valid_text_message_received(bool woman, bool under5) => valid_text_message_received(woman, under5, null);
         protected static TextMessageReceived text_message_received_with_invalid_health_risk_id(bool woman, bool under5) => text_message_received_with_invalid_health_risk_id(woman, under5, null);
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_a_negative_age_group.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_age_group.cs
similarity index 82%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_a_negative_age_group.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_age_group.cs
index 9e43a6ca7..c6974f60b 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_a_negative_age_group.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_age_group.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_age_group : given.a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash
+    public class when_report_has_a_negative_age_group : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_a_negative_health_risk.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_health_risk.cs
similarity index 82%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_a_negative_health_risk.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_health_risk.cs
index 4897245b3..02defd537 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_a_negative_health_risk.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_health_risk.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_health_risk : given.a_text_message_received_builder_for_single_case_report_separated_by_star
+    public class when_report_has_a_negative_health_risk : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_a_negative_sex.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_sex.cs
similarity index 82%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_a_negative_sex.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_sex.cs
index 3c9f9fcfa..41895bfb6 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_a_negative_sex.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_a_negative_sex.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_a_negative_sex : given.a_text_message_received_builder_for_single_case_report_separated_by_star
+    public class when_report_has_a_negative_sex : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_an_invalid_value_for_age_group.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_age_group.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_an_invalid_value_for_age_group.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_age_group.cs
index 8a76bc088..7aa1d73d3 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_has_an_invalid_value_for_age_group.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_age_group.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_invalid_value_for_age_group : given.a_text_message_received_builder_for_single_case_report_separated_by_star
+    public class when_report_has_an_invalid_value_for_age_group : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_health_risk.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_health_risk.cs
similarity index 83%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_health_risk.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_health_risk.cs
index 2c9bea673..8471a64a2 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_an_invalid_value_for_health_risk.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_health_risk.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class and_parsing_a_report_with_an_invalid_health_risk : given.a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash
+    public class and_parsing_a_report_with_an_invalid_health_risk : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_an_invalid_value_for_sex.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_sex.cs
similarity index 79%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_an_invalid_value_for_sex.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_sex.cs
index 95842eec2..6332711c3 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_an_invalid_value_for_sex.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_an_invalid_value_for_sex.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class and_parsing_a_report_with_an_invalid_sex : given.a_text_message_received_builder_for_single_case_report_separated_by_hash
+    public class and_parsing_a_report_with_an_invalid_sex : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_an_out_of_range_value_for_age_group.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_an_out_of_range_value_for_age_group.cs
similarity index 85%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_an_out_of_range_value_for_age_group.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_an_out_of_range_value_for_age_group.cs
index 9b82a07e4..a1a91ca35 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_has_an_out_of_range_value_for_age_group.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_an_out_of_range_value_for_age_group.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_out_of_range_value_for_age_group : given.a_text_message_received_builder_for_single_case_report_separated_by_hash
+    public class when_report_has_an_out_of_range_value_for_age_group : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_an_out_of_range_value_for_sex.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_an_out_of_range_value_for_sex.cs
similarity index 85%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_an_out_of_range_value_for_sex.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_an_out_of_range_value_for_sex.cs
index 3630f822c..f5ab6ab0a 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star_and_hash/when_report_has_an_out_of_range_value_for_sex.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_has_an_out_of_range_value_for_sex.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star_and_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_has_an_out_of_range_value_for_sex : given.a_text_message_received_builder_for_single_case_report_separated_by_star_and_hash
+    public class when_report_has_an_out_of_range_value_for_sex : a_text_message_received_builder_for_single_case_report
     {
         static readonly NotificationParser parser = new NotificationParser();
         static TextMessageReceived received_text_message;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_is_of_a_man_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_is_of_a_man_over_5.cs
similarity index 87%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_is_of_a_man_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_is_of_a_man_over_5.cs
index fe3bf0b8c..585589594 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_is_of_a_man_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_is_of_a_man_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_is_of_a_man_over_5 : given.a_text_message_received_builder_for_single_case_report_separated_by_hash
+    public class when_report_is_of_a_man_over_5 : a_text_message_received_builder_for_single_case_report
     {
         static readonly bool is_female = false;
         static readonly bool age_is_under_5 = false;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_is_of_a_man_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_is_of_a_man_under_5.cs
similarity index 87%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_is_of_a_man_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_is_of_a_man_under_5.cs
index 1b6a328f3..5c73a049b 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_is_of_a_man_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_is_of_a_man_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_is_of_a_man_under_5 : given.a_text_message_received_builder_for_single_case_report_separated_by_hash
+    public class when_report_is_of_a_man_under_5 : a_text_message_received_builder_for_single_case_report
     {
         static readonly bool is_female = false;
         static readonly bool age_is_under_5 = true;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_is_of_a_woman_over_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_is_of_a_woman_over_5.cs
similarity index 87%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_is_of_a_woman_over_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_is_of_a_woman_over_5.cs
index 860d9cc97..2a5d344a6 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_hash/when_report_is_of_a_woman_over_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_is_of_a_woman_over_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_hash
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_is_of_a_woman_over_5 : given.a_text_message_received_builder_for_single_case_report_separated_by_hash
+    public class when_report_is_of_a_woman_over_5 : a_text_message_received_builder_for_single_case_report
     {
         static readonly bool is_female = true;
         static readonly bool age_is_under_5 = false;
diff --git a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_is_of_a_woman_under_5.cs b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_is_of_a_woman_under_5.cs
similarity index 87%
rename from Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_is_of_a_woman_under_5.cs
rename to Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_is_of_a_woman_under_5.cs
index bd23f6ec6..b48c7684e 100644
--- a/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_text_message_with_a_correctly_formated_single_case_report/separated_by_star/when_report_is_of_a_woman_under_5.cs
+++ b/Source/Reporting/Policies.Specs/Reporting/for_notifications/when_parsing_a_correctly_formated_single_case_report_sms/separated_by_star_and_hash/when_report_is_of_a_woman_under_5.cs
@@ -3,16 +3,15 @@
  *  Licensed under the MIT License. See LICENSE in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-using System;
-using System.Collections.Generic;
 using Events.NotificationGateway.Reporting.SMS;
 using Machine.Specifications;
 using Policies.Reporting.Notifications;
+using Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash.given;
 
-namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_text_message_with_a_correctly_formated_single_case_report.separated_by_star
+namespace Policies.Specs.Reporting.for_notifications.when_parsing_a_correctly_formated_single_case_report_sms.separated_by_star_and_hash
 {
     [Subject("Notification")]
-    public class when_report_is_of_a_woman_under_5 : given.a_text_message_received_builder_for_single_case_report_separated_by_star
+    public class when_report_is_of_a_woman_under_5 : a_text_message_received_builder_for_single_case_report
     {
         static readonly bool is_female = true;
         static readonly bool age_is_under_5 = true;