diff --git a/Makefile b/Makefile
index 4d4f056ec..104472d36 100644
--- a/Makefile
+++ b/Makefile
@@ -313,9 +313,9 @@ setup-dev:
 	echo "Replaced by Nix shell. Use 'make shell' or just any target as-is."
 
 generate-handlers:
-	go generate ./_assets/generate_handlers/
+	go generate ./cmd/generate_handlers/
 generate: ##@other Regenerate assets and other auto-generated stuff
-	go generate ./static ./static/mailserver_db_migrations ./t ./multiaccounts/... ./appdatabase/... ./protocol/... ./walletdatabase/... ./_assets/generate_handlers
+	go generate ./static ./static/mailserver_db_migrations ./t ./multiaccounts/... ./appdatabase/... ./protocol/... ./walletdatabase/... ./cmd/generate_handlers
 
 generate-appdatabase:
 	go generate ./appdatabase/...
diff --git a/_assets/generate_handlers/generate_handlers.go b/cmd/generate_handlers/generate_handlers.go
similarity index 100%
rename from _assets/generate_handlers/generate_handlers.go
rename to cmd/generate_handlers/generate_handlers.go
diff --git a/_assets/generate_handlers/generate_handlers_template.txt b/cmd/generate_handlers/generate_handlers_template.txt
similarity index 100%
rename from _assets/generate_handlers/generate_handlers_template.txt
rename to cmd/generate_handlers/generate_handlers_template.txt
diff --git a/protocol/sqlite/migrations.go b/protocol/sqlite/prepare_migrations.go
similarity index 100%
rename from protocol/sqlite/migrations.go
rename to protocol/sqlite/prepare_migrations.go
diff --git a/protocol/sqlite/migrations_test.go b/protocol/sqlite/prepare_migrations_test.go
similarity index 100%
rename from protocol/sqlite/migrations_test.go
rename to protocol/sqlite/prepare_migrations_test.go