diff --git a/api/error.go b/api/error.gen.go
similarity index 100%
rename from api/error.go
rename to api/error.gen.go
diff --git a/api/error_details.go b/api/error_details.gen.go
similarity index 100%
rename from api/error_details.go
rename to api/error_details.gen.go
diff --git a/api/hosts/awsec2_host_catalog.go b/api/hosts/awsec2_host_catalog.gen.go
similarity index 100%
rename from api/hosts/awsec2_host_catalog.go
rename to api/hosts/awsec2_host_catalog.gen.go
diff --git a/api/hosts/create.go b/api/hosts/create.gen.go
similarity index 100%
rename from api/hosts/create.go
rename to api/hosts/create.gen.go
diff --git a/api/hosts/host.go b/api/hosts/host.gen.go
similarity index 100%
rename from api/hosts/host.go
rename to api/hosts/host.gen.go
diff --git a/api/hosts/host_catalog.go b/api/hosts/host_catalog.gen.go
similarity index 100%
rename from api/hosts/host_catalog.go
rename to api/hosts/host_catalog.gen.go
diff --git a/api/hosts/host_set.go b/api/hosts/host_set.gen.go
similarity index 100%
rename from api/hosts/host_set.go
rename to api/hosts/host_set.gen.go
diff --git a/api/hosts/static_host_catalog.go b/api/hosts/static_host_catalog.gen.go
similarity index 100%
rename from api/hosts/static_host_catalog.go
rename to api/hosts/static_host_catalog.gen.go
diff --git a/api/internal/genapi/create.go b/api/internal/genapi/create.go
index 35e542cd92..151515bb26 100644
--- a/api/internal/genapi/create.go
+++ b/api/internal/genapi/create.go
@@ -37,7 +37,7 @@ var createFuncs = map[string][]*createInfo{
 
 func writeCreateFuncs() {
 	for outPkg, funcs := range createFuncs {
-		outFile := os.Getenv("APIGEN_BASEPATH") + fmt.Sprintf("/api/%s/create.go", outPkg)
+		outFile := os.Getenv("APIGEN_BASEPATH") + fmt.Sprintf("/api/%s/create.gen.go", outPkg)
 		outBuf := bytes.NewBuffer([]byte(fmt.Sprintf(
 			`// Code generated by "make api"; DO NOT EDIT.
 package %s
diff --git a/api/internal/genapi/input.go b/api/internal/genapi/input.go
index c0cc4898f5..c45d0baab2 100644
--- a/api/internal/genapi/input.go
+++ b/api/internal/genapi/input.go
@@ -20,7 +20,7 @@ var inputStructs = []*structInfo{
 	{
 		os.Getenv("APIGEN_BASEPATH") + "/internal/gen/controller/api/error.pb.go",
 		"Error",
-		os.Getenv("APIGEN_BASEPATH") + "/api/error.go",
+		os.Getenv("APIGEN_BASEPATH") + "/api/error.gen.go",
 		"Error",
 		"api",
 		"",
@@ -31,7 +31,7 @@ var inputStructs = []*structInfo{
 	{
 		os.Getenv("APIGEN_BASEPATH") + "/internal/gen/controller/api/error.pb.go",
 		"ErrorDetails",
-		os.Getenv("APIGEN_BASEPATH") + "/api/error_details.go",
+		os.Getenv("APIGEN_BASEPATH") + "/api/error_details.gen.go",
 		"ErrorDetails",
 		"api",
 		"",
@@ -42,7 +42,7 @@ var inputStructs = []*structInfo{
 	{
 		os.Getenv("APIGEN_BASEPATH") + "/internal/gen/controller/api/resources/hosts/host.pb.go",
 		"Host",
-		os.Getenv("APIGEN_BASEPATH") + "/api/hosts/host.go",
+		os.Getenv("APIGEN_BASEPATH") + "/api/hosts/host.gen.go",
 		"Host",
 		"hosts",
 		"",
@@ -53,7 +53,7 @@ var inputStructs = []*structInfo{
 	{
 		os.Getenv("APIGEN_BASEPATH") + "/internal/gen/controller/api/resources/hosts/host_set.pb.go",
 		"HostSet",
-		os.Getenv("APIGEN_BASEPATH") + "/api/hosts/host_set.go",
+		os.Getenv("APIGEN_BASEPATH") + "/api/hosts/host_set.gen.go",
 		"HostSet",
 		"hosts",
 		"",
@@ -64,7 +64,7 @@ var inputStructs = []*structInfo{
 	{
 		os.Getenv("APIGEN_BASEPATH") + "/internal/gen/controller/api/resources/hosts/host_catalog.pb.go",
 		"HostCatalog",
-		os.Getenv("APIGEN_BASEPATH") + "/api/hosts/host_catalog.go",
+		os.Getenv("APIGEN_BASEPATH") + "/api/hosts/host_catalog.gen.go",
 		"HostCatalog",
 		"hosts",
 		"",
@@ -75,7 +75,7 @@ var inputStructs = []*structInfo{
 	{
 		os.Getenv("APIGEN_BASEPATH") + "/internal/gen/controller/api/resources/hosts/host_catalog.pb.go",
 		"StaticHostCatalogDetails",
-		os.Getenv("APIGEN_BASEPATH") + "/api/hosts/static_host_catalog.go",
+		os.Getenv("APIGEN_BASEPATH") + "/api/hosts/static_host_catalog.gen.go",
 		"StaticHostCatalogDetails",
 		"hosts",
 		"",
@@ -86,7 +86,7 @@ var inputStructs = []*structInfo{
 	{
 		os.Getenv("APIGEN_BASEPATH") + "/internal/gen/controller/api/resources/hosts/host_catalog.pb.go",
 		"AwsEc2HostCatalogDetails",
-		os.Getenv("APIGEN_BASEPATH") + "/api/hosts/awsec2_host_catalog.go",
+		os.Getenv("APIGEN_BASEPATH") + "/api/hosts/awsec2_host_catalog.gen.go",
 		"AwsEc2HostCatalogDetails",
 		"hosts",
 		"",