diff --git a/templates/blocks.tmpl b/templates/blocks.tmpl
index fe668fc..ca794a1 100644
--- a/templates/blocks.tmpl
+++ b/templates/blocks.tmpl
@@ -19,16 +19,16 @@ typedef struct {
     {{.DataType}} {{.Name}};
     {{- end}}
     {{- end }}
-}{{ .Name }}Payload;
+} {{ .Name }}Payload;
 {{ end }}
 {{end}}
 
 {{define "union"}}
 typedef union {
     {{- range .}}
-    {{.Name}} {{ .Name | snake}}
+    {{.Name}}Payload {{ .Name | snake}};
     {{- end }}
-}PayloadUnion:
+} PayloadUnion;
 {{end}}
 
 {{define "handler"}}