diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c24fda59..2557773f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,10 +9,10 @@ jobs:
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}
-      ECR_REPOSITORY: 571094861812.dkr.ecr.us-east-1.amazonaws.com/name-generator
-      PROD_IMAGE_TAG: prod-name-generator
-      CLUSTER_NAME: prod-name-generator
-      SERVICE_NAME: prod-name-generator-server
+      ECR_REPOSITORY: 571094861812.dkr.ecr.us-east-1.amazonaws.com/namegraph
+      PROD_IMAGE_TAG: prod-namegraph
+      CLUSTER_NAME: prod-namegraph
+      SERVICE_NAME: prod-namegraph-server
 
     steps:
       - uses: actions/checkout@v2
diff --git a/authorize-ecr.sh b/authorize-ecr.sh
index 6974d2f6..0c7e60f3 100755
--- a/authorize-ecr.sh
+++ b/authorize-ecr.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 571094861812.dkr.ecr.us-east-1.amazonaws.com/name-generator
+aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 571094861812.dkr.ecr.us-east-1.amazonaws.com/namegraph
diff --git a/docker-compose.build.yml b/docker-compose.build.yml
index d8555d41..33cbfa48 100644
--- a/docker-compose.build.yml
+++ b/docker-compose.build.yml
@@ -4,4 +4,4 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: 571094861812.dkr.ecr.us-east-1.amazonaws.com/name-generator:${TAG}
+    image: 571094861812.dkr.ecr.us-east-1.amazonaws.com/namegraph:${TAG}
diff --git a/docker-compose.yml b/docker-compose.yml
index e48be106..946417ec 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,6 +9,6 @@ services:
       - ES_USERNAME=${ES_USERNAME}
       - ES_PASSWORD=${ES_PASSWORD}
       - ES_INDEX=${ES_INDEX}
-    image: 571094861812.dkr.ecr.us-east-1.amazonaws.com/name-generator:${TAG}
+    image: 571094861812.dkr.ecr.us-east-1.amazonaws.com/namegraph:${TAG}
     ports:
       - 80:8000
\ No newline at end of file
diff --git a/docs/old_readme.md b/docs/old_readme.md
index a6066f4c..16cad78b 100644
--- a/docs/old_readme.md
+++ b/docs/old_readme.md
@@ -97,7 +97,7 @@ Authorize to ECR:
 
 Push image to ECR:
 
-`docker push 571094861812.dkr.ecr.us-east-1.amazonaws.com/name-generator:${TAG}
+`docker push 571094861812.dkr.ecr.us-east-1.amazonaws.com/namegraph:${TAG}
 
 ## Deploy image on remote instance
 
@@ -107,7 +107,7 @@ Set image TAG:
 
 Authorize EC2 instance in ECR:
 
-`aws ecr get-login-password | docker login --username AWS --password-stdin 571094861812.dkr.ecr.us-east-1.amazonaws.com/name-generator`
+`aws ecr get-login-password | docker login --username AWS --password-stdin 571094861812.dkr.ecr.us-east-1.amazonaws.com/namegraph`
 
 (Re-Deploy) image:
 
diff --git a/namegraph/download_from_s3.py b/namegraph/download_from_s3.py
index cddbdbf9..1c91220f 100644
--- a/namegraph/download_from_s3.py
+++ b/namegraph/download_from_s3.py
@@ -14,7 +14,7 @@ class S3Downloader:
     def __init__(self):
         self.s3_client = None
         self.region_name = 'us-east-1'
-        self.bucket = 'prod-name-generator-namegeneratori-inputss3bucket-c26jqo3twfxy'
+        self.bucket = 'prod-namegraph-namegeneratori-inputss3bucket-c26jqo3twfxy'
 
     def get_client(self):
         if self.s3_client is None:
diff --git a/readme.md b/readme.md
index a913a9ce..e9d0dab8 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,3 @@
-
 <!-- VERTICAL WHITESPACE -->
 
 <br>
diff --git a/research/other-collections/map-ids.py b/research/other-collections/map-ids.py
index 1493597d..7a4a456f 100644
--- a/research/other-collections/map-ids.py
+++ b/research/other-collections/map-ids.py
@@ -77,7 +77,7 @@ def collect_elastic_ids_for_wikidata_ids(es: Elasticsearch, index: str, wikidata
     with open(args.output, 'w', encoding='utf-8') as f:
         json.dump(mapped_other_collections_records, f, indent=2, ensure_ascii=False)
 
-    # name-generator/data/collections_data/other_collections.json
+    # namegraph/data/collections_data/other_collections.json
 
     # No elastic ID for Q1322417 - Wealthiest historical figures
     # No elastic ID for Q1547772 - Stars for navigation