diff --git a/Dockerfile-boxed-core b/Dockerfile-core
similarity index 100%
rename from Dockerfile-boxed-core
rename to Dockerfile-core
diff --git a/Dockerfile-boxed-dinglehopper b/Dockerfile-dinglehopper
similarity index 91%
rename from Dockerfile-boxed-dinglehopper
rename to Dockerfile-dinglehopper
index 312121c..dfa9c1a 100644
--- a/Dockerfile-boxed-dinglehopper
+++ b/Dockerfile-dinglehopper
@@ -1,4 +1,4 @@
-FROM boxed-core
+FROM my_ocrd_workflow-core
 
 
 ENV DINGLEHOPPER_COMMIT 2b98f69
diff --git a/Dockerfile-boxed-ocrd_calamari b/Dockerfile-ocrd_calamari
similarity index 94%
rename from Dockerfile-boxed-ocrd_calamari
rename to Dockerfile-ocrd_calamari
index 4fbe5d7..209a2d8 100644
--- a/Dockerfile-boxed-ocrd_calamari
+++ b/Dockerfile-ocrd_calamari
@@ -1,4 +1,4 @@
-FROM boxed-core
+FROM my_ocrd_workflow-core
 
 
 # Build pip installable stuff
diff --git a/Dockerfile-boxed-ocrd_olena b/Dockerfile-ocrd_olena
similarity index 97%
rename from Dockerfile-boxed-ocrd_olena
rename to Dockerfile-ocrd_olena
index 0d4ced8..25b447d 100644
--- a/Dockerfile-boxed-ocrd_olena
+++ b/Dockerfile-ocrd_olena
@@ -1,4 +1,4 @@
-FROM boxed-core
+FROM my_ocrd_workflow-core
 
 ENV OCRD_OLENA_VERSION 1.2.0
 
diff --git a/Dockerfile-boxed-ocrd_tesserocr b/Dockerfile-ocrd_tesserocr
similarity index 96%
rename from Dockerfile-boxed-ocrd_tesserocr
rename to Dockerfile-ocrd_tesserocr
index 125b6b0..92cb263 100644
--- a/Dockerfile-boxed-ocrd_tesserocr
+++ b/Dockerfile-ocrd_tesserocr
@@ -1,4 +1,4 @@
-FROM boxed-core
+FROM my_ocrd_workflow-core
 
 
 ENV TESSDATA_BEST_VERSION 4.0.0
diff --git a/Dockerfile-boxed-sbb_textline_detector b/Dockerfile-sbb_textline_detector
similarity index 93%
rename from Dockerfile-boxed-sbb_textline_detector
rename to Dockerfile-sbb_textline_detector
index 75386d1..ed4e44b 100644
--- a/Dockerfile-boxed-sbb_textline_detector
+++ b/Dockerfile-sbb_textline_detector
@@ -1,4 +1,4 @@
-FROM boxed-core
+FROM my_ocrd_workflow-core
 
 
 ENV SBB_TEXTLINE_DETECTOR_COMMIT 8b01d9e
diff --git a/build b/build
index f19907e..d0ad1fa 100755
--- a/build
+++ b/build
@@ -21,9 +21,9 @@ get_from_web() {
 handle_data
 
 
-docker build -t boxed-core                  -f Dockerfile-boxed-core                  .
-docker build -t boxed-ocrd_calamari         -f Dockerfile-boxed-ocrd_calamari         .
-docker build -t boxed-dinglehopper          -f Dockerfile-boxed-dinglehopper          .
-docker build -t boxed-ocrd_olena            -f Dockerfile-boxed-ocrd_olena            .
-docker build -t boxed-ocrd_tesserocr        -f Dockerfile-boxed-ocrd_tesserocr        .
-docker build -t boxed-sbb_textline_detector -f Dockerfile-boxed-sbb_textline_detector .
+docker build -t my_ocrd_workflow-core                  -f Dockerfile-core                  .
+docker build -t my_ocrd_workflow-ocrd_calamari         -f Dockerfile-ocrd_calamari         .
+docker build -t my_ocrd_workflow-dinglehopper          -f Dockerfile-dinglehopper          .
+docker build -t my_ocrd_workflow-ocrd_olena            -f Dockerfile-ocrd_olena            .
+docker build -t my_ocrd_workflow-ocrd_tesserocr        -f Dockerfile-ocrd_tesserocr        .
+docker build -t my_ocrd_workflow-sbb_textline_detector -f Dockerfile-sbb_textline_detector .
diff --git a/run b/run
index b2ce3ea..de48bc9 100755
--- a/run
+++ b/run
@@ -31,12 +31,12 @@ build_alias() {
   alias $command="docker run $docker_run_options $docker_image $command"
 }
 shopt -s expand_aliases  # Required for non-interactive shells
-build_alias ocrd                       boxed-core
-build_alias ocrd-olena-binarize        boxed-ocrd_olena
-build_alias ocrd-sbb-textline-detector boxed-sbb_textline_detector
-build_alias ocrd-calamari-recognize    boxed-ocrd_calamari
-build_alias ocrd-tesserocr-recognize   boxed-ocrd_tesserocr
-build_alias ocrd-dinglehopper          boxed-dinglehopper
+build_alias ocrd                       my_ocrd_workflow-core
+build_alias ocrd-olena-binarize        my_ocrd_workflow-ocrd_olena
+build_alias ocrd-sbb-textline-detector my_ocrd_workflow-sbb_textline_detector
+build_alias ocrd-calamari-recognize    my_ocrd_workflow-ocrd_calamari
+build_alias ocrd-tesserocr-recognize   my_ocrd_workflow-ocrd_tesserocr
+build_alias ocrd-dinglehopper          my_ocrd_workflow-dinglehopper
 
 
 . $self_dir/my_ocrd_workflow