diff --git a/proto/environments/environments_v1.proto b/proto/environments/environments_v1.proto
index bca1628..df4ca01 100644
--- a/proto/environments/environments_v1.proto
+++ b/proto/environments/environments_v1.proto
@@ -32,33 +32,33 @@ message Token {
  */
 
 message CreateOptions {
-  EnvironmentName name = 1;
-  EnvironmentData data = 2;
+  EnvironmentMetadata metadata = 1;
+  EnvironmentSpec spec = 2;
   OwnerId owner_id = 3;
   Token token = 4;
 }
 
 message UpdateOptions {
-  EnvironmentName name = 1;
-  EnvironmentData data = 2;
+  EnvironmentMetadata metadata = 1;
+  EnvironmentSpec spec = 2;
   OwnerId owner_id = 3;
   Token token = 4;
 }
 
 message DeleteOptions {
-  EnvironmentName name = 1;
+  EnvironmentMetadata metadata = 1;
   OwnerId owner_id = 3;
   Token token = 4;
 }
 
 message GetOptions {
-  EnvironmentName name = 1;
+  EnvironmentMetadata metadata = 1;
   OwnerId owner_id = 3;
   Token token = 4;
 }
 
 message ListOptions {
-  EnvironmentName name = 1;
+  EnvironmentMetadata metadata = 1;
   OwnerId owner_id = 3;
   Token token = 4;
 }
@@ -66,19 +66,20 @@ message ListOptions {
   Environment related messages
  */
 
-message EnvironmentName {
+message EnvironmentMetadata {
   string name = 1; // A name of the environment
+  string description = 2;
 }
 
-message EnvironmentData {
+message EnvironmentSpec {
   Provider provider = 2; // Provide
   Kubernetes kubernetes = 3;
   HetznerOptions hetzner_options = 4;
 }
 
 message EnvironmentFull {
-  EnvironmentName name = 1;
-  EnvironmentData data = 2;
+  EnvironmentMetadata metadata = 1;
+  EnvironmentSpec spec = 2;
 }