diff --git a/pulsar/client/interface.py b/pulsar/client/interface.py
index 40ea4e6b92505d799f728e3098b2dbd4e26db6d1..1dc98fc6265d8ce6a81453f4777474acac5dbc9d 100644
--- a/pulsar/client/interface.py
+++ b/pulsar/client/interface.py
@@ -117,7 +117,7 @@ class LocalPulsarInterface(PulsarInterface):
         self.object_store = object_store
 
     def __app_args(self):
-        # Arguments that would be specified from LwrApp if running
+        # Arguments that would be specified from PulsarApp if running
         # in web server.
         return {
             'manager': self.job_manager,
diff --git a/pulsar/core.py b/pulsar/core.py
index c07fcf7185c6b9063be6f33fdc646a1a9fc7eb69..ef7751e262dd1b05b45d0355def9972fb30e46cf 100644
--- a/pulsar/core.py
+++ b/pulsar/core.py
@@ -26,7 +26,7 @@ NOT_WHITELIST_WARNING = "Starting the LWR without a toolbox to white-list." + \
                         "Ensure this application is protected by firewall or a configured private token."
 
 
-class LwrApp(object):
+class PulsarApp(object):
 
     def __init__(self, **conf):
         if conf is None:
@@ -86,7 +86,7 @@ class LwrApp(object):
     def __setup_private_key(self, private_key):
         self.private_key = private_key
         if private_key:
-            log.info("Securing LWR web app with private key, please verify you are using HTTPS so key cannot be obtained by monitoring traffic.")
+            log.info("Securing Pulsar web app with private key, please verify you are using HTTPS so key cannot be obtained by monitoring traffic.")
 
     def __setup_persistence_directory(self, persistence_directory):
         self.persistence_directory = persistence_directory or DEFAULT_PERSISTENCE_DIRECTORY
diff --git a/pulsar/daemon.py b/pulsar/daemon.py
index 77692169ddf7b45fe0f31d3d33cda425d3f4178e..7c4154c1d6624405f89a8c05cc9b2bf9b5e0cc21 100644
--- a/pulsar/daemon.py
+++ b/pulsar/daemon.py
@@ -73,7 +73,7 @@ def load_pulsar_app(
 
     config.update(kwds)
     import pulsar.core
-    pulsar_app = pulsar.core.LwrApp(**config)
+    pulsar_app = pulsar.core.PulsarApp(**config)
     return pulsar_app
 
 
diff --git a/pulsar/web/wsgi.py b/pulsar/web/wsgi.py
index d164882a321d3eb3bc6b238a65397e16efda9be2..061126df3c8cd3760b5f84f4f3ac758893bd01ae 100644
--- a/pulsar/web/wsgi.py
+++ b/pulsar/web/wsgi.py
@@ -1,7 +1,7 @@
 import atexit
 import inspect
 
-from pulsar.core import LwrApp
+from pulsar.core import PulsarApp
 from pulsar.web.framework import RoutingApp
 
 import pulsar.web.routes
@@ -11,7 +11,7 @@ def app_factory(global_conf, **local_conf):
     """
     Returns the LWR WSGI application.
     """
-    pulsar_app = LwrApp(global_conf=global_conf, **local_conf)
+    pulsar_app = PulsarApp(global_conf=global_conf, **local_conf)
     webapp = LwrWebApp(pulsar_app=pulsar_app)
     atexit.register(webapp.shutdown)
     return webapp