diff --git a/README.md b/README.md
index 0b2dbbd..aac02b6 100644
--- a/README.md
+++ b/README.md
@@ -19,9 +19,9 @@ values (e.g. `beamlineParameters`...)
 To use the config values in an experimental application (e.g. Hyperion) you can do:
 
 ```python
-from daq_config_server.client import ConfigService
+from daq_config_server.client import ConfigServer
 
-daq_config_server = ConfigService("<service ip address>", <port>)
+daq_config_server = ConfigServer("<service ip address>", <port>)
 
 use_stub_offsets: bool = daq_config_server.best_effort_get_feature_flag("use_stub_offsets")
 
diff --git a/src/daq_config_server/app.py b/src/daq_config_server/app.py
index 27cd853..b63e17b 100644
--- a/src/daq_config_server/app.py
+++ b/src/daq_config_server/app.py
@@ -21,7 +21,7 @@
     ROOT_PATH = ""
 
 app = FastAPI(
-    title="DAQ config service",
+    title="DAQ config server",
     description="""For storing and fetching beamline parameters, etc. which are needed
     by more than one applicatioon or service""",
     root_path=ROOT_PATH,
diff --git a/src/daq_config_server/client.py b/src/daq_config_server/client.py
index 897f701..03ac132 100644
--- a/src/daq_config_server/client.py
+++ b/src/daq_config_server/client.py
@@ -8,7 +8,7 @@
 T = TypeVar("T")
 
 
-class ConfigService:
+class ConfigServer:
     def __init__(self, address: str, port: int, log: Logger | None = None) -> None:
         self.address = address
         self.port = port