diff --git a/care/facility/api/serializers/patient_otp.py b/care/facility/api/serializers/patient_otp.py
index 9d6951e883..7457ac8454 100644
--- a/care/facility/api/serializers/patient_otp.py
+++ b/care/facility/api/serializers/patient_otp.py
@@ -26,7 +26,7 @@ def send_sms(otp, phone_number):
         sendSMS(
             phone_number,
             (
-                f"CoronaSafe Network Patient Management System Login, OTP is {otp} . "
+                f"Open Healthcare Network Patient Management System Login, OTP is {otp} . "
                 "Please do not share this Confidential Login Token with anyone else"
             ),
         )
diff --git a/care/facility/models/prescription.py b/care/facility/models/prescription.py
index 93221302ad..b6aca21eab 100644
--- a/care/facility/models/prescription.py
+++ b/care/facility/models/prescription.py
@@ -64,7 +64,7 @@ class MedibaseMedicine(BaseModel):
     atc_classification = models.TextField(blank=True, null=True)
 
     def __str__(self):
-        return " - ".join([self.name, self.generic, self.company])
+        return " - ".join(filter(None, [self.name, self.generic, self.company]))
 
 
 class Prescription(BaseModel):
diff --git a/care/templates/base.html b/care/templates/base.html
index 9270456239..53b13042d1 100644
--- a/care/templates/base.html
+++ b/care/templates/base.html
@@ -104,7 +104,7 @@
             alt="Digital Public Goods logo" />
         </a>
         <a href="https://coronasafe.network/">
-          CoronaSafe Network is an open-source digital public good designed by
+          Open Healthcare Network is an open-source digital public good designed by
           a multi-disciplinary team of innovators and volunteers who are working on a model to support
           Government efforts.</a>&nbsp;
         <a href="https://github.com/coronasafe" class="care-secondary-color">(Github)</a>
diff --git a/care/templates/email/user_reset_password.html b/care/templates/email/user_reset_password.html
index 7c5e29a087..8eb0100c40 100644
--- a/care/templates/email/user_reset_password.html
+++ b/care/templates/email/user_reset_password.html
@@ -1,5 +1,5 @@
 Hi,
-Greetings from Coronasafe Network,
+Greetings from Open Healthcare Network,
 Please click the following link to reset your password for your account with username {{username}}
  <a href="{{reset_password_url}}" > Click Here</a>
 
diff --git a/care/templates/email/user_reset_password.txt b/care/templates/email/user_reset_password.txt
index df328882a5..2a2e8a703f 100644
--- a/care/templates/email/user_reset_password.txt
+++ b/care/templates/email/user_reset_password.txt
@@ -1,5 +1,5 @@
 Hi,
-Greetings from Coronasafe Network,
+Greetings from Open Healthcare Network,
 Please click the following link to reset your password
 {{reset_password_url}}