diff --git a/{{cookiecutter.plugin_name}}/py_sources/src/north_tools/__init__.py b/{{cookiecutter.plugin_name}}/py_sources/src/north_tools/__init__.py
index 47b49cf..a29e4b0 100644
--- a/{{cookiecutter.plugin_name}}/py_sources/src/north_tools/__init__.py
+++ b/{{cookiecutter.plugin_name}}/py_sources/src/north_tools/__init__.py
@@ -1,5 +1,5 @@
 from nomad.config.models.north import NORTHTool
-from nomad.config.models.plugins import NorthToolEntryPoint
+from nomad.config.models.plugins import NORTHToolEntryPoint
 
 {{cookiecutter.north_tool_name}} = NORTHTool(
     short_description='Jupyter Notebook server in NOMAD NORTH for NOMAD plugin {{cookiecutter.plugin_name}}.',
@@ -18,7 +18,7 @@
     display_name='{{cookiecutter.north_tool_name}}',
 )
 
-north_entry_point = NorthToolEntryPoint(
+north_entry_point = NORTHToolEntryPoint(
     id_url_safe='{{cookiecutter.module_name | replace("_", "-")}}-{{cookiecutter.north_tool_name | replace("_", "-")}}',
     north_tool={{cookiecutter.north_tool_name}},
 )
diff --git a/{{cookiecutter.plugin_name}}/py_sources/src/north_tools/{{cookiecutter.north_tool_name}}/README.md b/{{cookiecutter.plugin_name}}/py_sources/src/north_tools/{{cookiecutter.north_tool_name}}/README.md
index 9055281..a6c0c88 100644
--- a/{{cookiecutter.plugin_name}}/py_sources/src/north_tools/{{cookiecutter.north_tool_name}}/README.md
+++ b/{{cookiecutter.plugin_name}}/py_sources/src/north_tools/{{cookiecutter.north_tool_name}}/README.md
@@ -4,7 +4,7 @@ This directory contains the configuration and a minimal Dockerfile template for
 
 ## Quick start
 
-The {{cookiecutter.north_tool_name}} NORTH tool provides a containerized environment defined in `NORTHtool` definition, `NorthToolEntryPoint`, and Dockerfile.
+The {{cookiecutter.north_tool_name}} NORTH tool provides a containerized environment defined in `NORTHtool` definition, `NORTHToolEntryPoint`, and Dockerfile.
 
 ## Base Image