diff --git a/Makefile b/Makefile
index 9299240..41b0888 100644
--- a/Makefile
+++ b/Makefile
@@ -58,16 +58,22 @@ check_buf:
 
 rename:
 	@echo "Current module path: $(GIT_REPO)"
-	@echo "Usage: make rename NAME=your/new/module/name"
+	@echo "Usage: make rename NAME=your/new/module/name APP=your-app-name"
 	@if [ -z "$(NAME)" ]; then \
-		echo "No name provided. Aborting."; \
+		echo "No package name provided. Aborting."; \
 		exit 1; \
 	fi
-	@echo "New name: $(NAME)"
+	@if [ -z "$(APP)" ]; then \
+		echo "No app name provided. Aborting."; \
+		exit 1; \
+	fi
+	@echo "New name: app=$(APP) pkg=$(NAME)"
 	@echo "Are you sure you want to proceed? (y/N): " && read CONFIRM && if [ "$$CONFIRM" != "y" ] && [ "$$CONFIRM" != "Y" ]; then \
 		echo "Aborted."; \
 		exit 1; \
 	fi
+	@sed -i "s|APP_NAME=.*|APP_NAME=$(APP)|g" Dockerfile
+	@sed -i "s|CMD_NAME := .*|CMD_NAME := $(APP)|g" Makefile
 	@find . -type f -a \
 	\( -name '*.go' -o -name 'go.mod' \
 		-o -name 'go.sum' -o -name '*.proto' \