diff --git a/java-std/{{cookiecutter.app_name}}/src/main/proto/domain/actors/postalcode.proto b/java-std/{{cookiecutter.app_name}}/src/main/proto/domain/actors/postalcode.proto
index 9695d97..56b4613 100644
--- a/java-std/{{cookiecutter.app_name}}/src/main/proto/domain/actors/postalcode.proto
+++ b/java-std/{{cookiecutter.app_name}}/src/main/proto/domain/actors/postalcode.proto
@@ -5,6 +5,7 @@ package domain.actors;
 import "domain/common.proto";
 
 option java_package = "io.eigr.spawn.java.domain.actors";
+option java_outer_classname = "PostalCodeProto";
 
 service PostalCode {
   rpc GetPostalCodeData(domain.GetRequest) returns (domain.GetResponse);
diff --git a/java-std/{{cookiecutter.app_name}}/src/main/proto/domain/actors/router.proto b/java-std/{{cookiecutter.app_name}}/src/main/proto/domain/actors/router.proto
index 9339c27..fc8fcd8 100644
--- a/java-std/{{cookiecutter.app_name}}/src/main/proto/domain/actors/router.proto
+++ b/java-std/{{cookiecutter.app_name}}/src/main/proto/domain/actors/router.proto
@@ -6,11 +6,12 @@ import "domain/common.proto";
 import "google/api/annotations.proto";
 
 option java_package = "io.eigr.spawn.java.domain.actors";
+option java_outer_classname = "RouterProto";
 
 service Router {
   rpc GetPostalCode(domain.GetRequest) returns (domain.GetResponse) {
     option (google.api.http) = {
-      get: "/v1/postalcodes/{code}"
+      get : "/v1/postalcodes/{code}"
     };
   }
 }
diff --git a/java-std/{{cookiecutter.app_name}}/src/main/proto/domain/common.proto b/java-std/{{cookiecutter.app_name}}/src/main/proto/domain/common.proto
index 7a16fbb..af2556d 100644
--- a/java-std/{{cookiecutter.app_name}}/src/main/proto/domain/common.proto
+++ b/java-std/{{cookiecutter.app_name}}/src/main/proto/domain/common.proto
@@ -3,6 +3,7 @@ syntax = "proto3";
 package domain;
 
 option java_package = "io.eigr.spawn.java.domain";
+option java_outer_classname = "DomainProto";
 
 enum PostalCodeStatus {
   UNKNOWN = 0;
@@ -22,6 +23,4 @@ message PostalCodeState {
 
 message GetRequest { string code = 1; }
 
-message GetResponse {
-  PostalCodeState postal_code = 1;
-}
+message GetResponse { PostalCodeState postal_code = 1; }