diff --git a/.gitignore b/.gitignore
index 894a44c..fb78ca3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -102,3 +102,7 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+
+# vim tmp
+*.swp
+*.swo
diff --git a/ocrd-tool.json b/ocrd-tool.json
index a1f548f..1034373 120000
--- a/ocrd-tool.json
+++ b/ocrd-tool.json
@@ -1 +1 @@
-ocrd_evaluate_segmentation/ocrd-tool.json
\ No newline at end of file
+ocrd_segment/ocrd-tool.json
\ No newline at end of file
diff --git a/ocrd_evaluate_segmentation/__init__.py b/ocrd_evaluate_segmentation/__init__.py
deleted file mode 100644
index 79f9182..0000000
--- a/ocrd_evaluate_segmentation/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from .evaluate import EvaluateSegmentation
diff --git a/ocrd_evaluate_segmentation/cli.py b/ocrd_evaluate_segmentation/cli.py
deleted file mode 100644
index 5b8b3b6..0000000
--- a/ocrd_evaluate_segmentation/cli.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import click
-
-from ocrd.decorators import ocrd_cli_options, ocrd_cli_wrap_processor
-from ocrd_evaluate_segmentation.evaluate import EvaluateSegmentation
-
-@click.command()
-@ocrd_cli_options
-def ocrd_evaluate_segmentation(*args, **kwargs):
-    return ocrd_cli_wrap_processor(EvaluateSegmentation, *args, **kwargs)
diff --git a/ocrd_segment/__init__.py b/ocrd_segment/__init__.py
new file mode 100644
index 0000000..9991432
--- /dev/null
+++ b/ocrd_segment/__init__.py
@@ -0,0 +1 @@
+from .repair import RepairSegmentation
diff --git a/ocrd_segment/cli.py b/ocrd_segment/cli.py
new file mode 100644
index 0000000..46625e0
--- /dev/null
+++ b/ocrd_segment/cli.py
@@ -0,0 +1,9 @@
+import click
+
+from ocrd.decorators import ocrd_cli_options, ocrd_cli_wrap_processor
+from ocrd_segment.repair import RepairSegmentation
+
+@click.command()
+@ocrd_cli_options
+def ocrd_segment_repair(*args, **kwargs):
+    return ocrd_cli_wrap_processor(RepairSegmentation, *args, **kwargs)
diff --git a/ocrd_evaluate_segmentation/config.py b/ocrd_segment/config.py
similarity index 100%
rename from ocrd_evaluate_segmentation/config.py
rename to ocrd_segment/config.py
diff --git a/ocrd_evaluate_segmentation/ocrd-tool.json b/ocrd_segment/ocrd-tool.json
similarity index 72%
rename from ocrd_evaluate_segmentation/ocrd-tool.json
rename to ocrd_segment/ocrd-tool.json
index 25e79d2..8052301 100644
--- a/ocrd_evaluate_segmentation/ocrd-tool.json
+++ b/ocrd_segment/ocrd-tool.json
@@ -1,11 +1,11 @@
 {
   "version": "0.0.1",
-  "git_url": "https://github.com/OCR-D/ocrd_evaluate_segmentation",
+  "git_url": "https://github.com/OCR-D/ocrd_segment",
   "tools": {
-    "ocrd-evaluate-segmentation": {
-      "executable": "ocrd-evaluate-segmentation",
+    "ocrd-segment-repair": {
+      "executable": "ocrd-segment-repair",
       "categories": ["Image preprocessing"],
-      "description": "Evaluate regions",
+      "description": "Evaluate and repair region segmentation",
       "input_file_grp": [
         "OCR-D-IMG",
         "OCR-D-SEG-BLOCK"
diff --git a/ocrd_evaluate_segmentation/evaluate.py b/ocrd_segment/repair.py
similarity index 96%
rename from ocrd_evaluate_segmentation/evaluate.py
rename to ocrd_segment/repair.py
index 651b8c6..6207930 100644
--- a/ocrd_evaluate_segmentation/evaluate.py
+++ b/ocrd_segment/repair.py
@@ -21,15 +21,15 @@
 
 from shapely.geometry import Polygon
 
-TOOL = 'ocrd-evaluate-segmentation'
-LOG = getLogger('processor.EvaluateSegmentation')
+TOOL = 'ocrd-segment-repair'
+LOG = getLogger('processor.RepairSegmentation')
 
-class EvaluateSegmentation(Processor):
+class RepairSegmentation(Processor):
 
     def __init__(self, *args, **kwargs):
         kwargs['ocrd_tool'] = OCRD_TOOL['tools'][TOOL]
         kwargs['version'] = OCRD_TOOL['version']
-        super(EvaluateSegmentation, self).__init__(*args, **kwargs)
+        super(RepairSegmentation, self).__init__(*args, **kwargs)
 
 
     def process(self):
diff --git a/setup.py b/setup.py
index b884d68..34fdd8a 100644
--- a/setup.py
+++ b/setup.py
@@ -2,20 +2,20 @@
 """
 Installs:
 
-    - ocrd-evaluate-segmentation
+    - ocrd-segment-repair
 """
 import codecs
 
 from setuptools import setup, find_packages
 
 setup(
-    name='ocrd_evaluate_segmentation',
+    name='ocrd_segment',
     version='0.0.1',
-    description='Segmentation evaluation',
+    description='Page segmentation and segmentation evaluation',
     long_description=codecs.open('README.md', encoding='utf-8').read(),
     author='Konstantin Baierer, Kay-Michael Würzner, Robert Sachunsky',
     author_email='unixprog@gmail.com, wuerzner@gmail.com, sachunsky@informatik.uni-leipzig.de',
-    url='https://github.com/OCR-D/ocrd_evaluate_segmentation',
+    url='https://github.com/OCR-D/ocrd_segment',
     license='Apache License 2.0',
     packages=find_packages(exclude=('tests', 'docs')),
     install_requires=open('requirements.txt').read().split('\n'),
@@ -24,7 +24,7 @@
     },
     entry_points={
         'console_scripts': [
-            'ocrd-evaluate-segmentation=ocrd_evaluate_segmentation.cli:ocrd_evaluate_segmentation',
+            'ocrd-segment-repair=ocrd_segment.cli:ocrd_segment_repair',
         ]
     },
 )