From 3b97718c6baf4d54e4bf74e4a3ab18830667c1cf Mon Sep 17 00:00:00 2001
From: Mohamed Elmoslemany <117270519+mo-c4t@users.noreply.github.com>
Date: Thu, 29 Aug 2024 09:43:03 +0200
Subject: [PATCH] change v1alpha to v1 (#30)

---
 .../accommodation/{v1alpha => v1}/info.proto  | 22 +++---
 .../accommodation/{v1alpha => v1}/list.proto  | 14 ++--
 .../{v1alpha => v1}/property_types.proto      | 64 ++++++++---------
 .../{v1alpha => v1}/search.proto              | 28 ++++----
 .../search_parameters_types.proto             | 34 ++++-----
 .../{v1alpha => v1}/search_query_types.proto  | 14 ++--
 .../{v1alpha => v1}/search_result_types.proto | 24 +++----
 .../{v1alpha => v1}/unit_types.proto          | 42 +++++------
 .../{v1alpha => v1}/activity_types.proto      | 70 +++++++++----------
 .../activity/{v1alpha => v1}/info.proto       | 22 +++---
 .../activity/{v1alpha => v1}/list.proto       | 14 ++--
 .../activity/{v1alpha => v1}/search.proto     | 56 +++++++--------
 .../search_parameters_types.proto             | 28 ++++----
 .../{v1alpha => v1}/search_result_types.proto | 20 +++---
 .../services/book/{v1alpha => v1}/mint.proto  | 46 ++++++------
 .../book/{v1alpha => v1}/validate.proto       | 28 ++++----
 .../{v1alpha => v1}/entry_requirements.proto  | 52 +++++++-------
 .../network/{v1alpha => v1}/fee.proto         |  6 +-
 .../partner_configuration.proto               | 10 +--
 .../services/ping/{v1alpha => v1}/ping.proto  | 12 ++--
 .../{v1alpha => v1}/availability.proto        | 20 +++---
 .../seat_map/{v1alpha => v1}/seat_map.proto   | 20 +++---
 .../transport/{v1alpha => v1}/search.proto    | 32 ++++-----
 .../search_parameters_types.proto             | 34 ++++-----
 .../{v1alpha => v1}/search_query_types.proto  | 20 +++---
 .../{v1alpha => v1}/search_result_types.proto | 36 +++++-----
 .../{v1alpha => v1}/trip_types.proto          | 38 +++++-----
 proto/cmp/types/{v1alpha => v1}/address.proto |  8 +--
 proto/cmp/types/{v1alpha => v1}/amenity.proto |  6 +-
 proto/cmp/types/{v1alpha => v1}/baggage.proto |  8 +--
 proto/cmp/types/{v1alpha => v1}/bed.proto     |  6 +-
 .../types/{v1alpha => v1}/bookability.proto   | 10 +--
 .../types/{v1alpha => v1}/cancel_policy.proto | 14 ++--
 .../types/{v1alpha => v1}/change_policy.proto | 14 ++--
 proto/cmp/types/{v1alpha => v1}/common.proto  |  6 +-
 proto/cmp/types/v1/contact_info.proto         | 26 +++++++
 .../{v1alpha => v1}/content_source.proto      |  6 +-
 proto/cmp/types/{v1alpha => v1}/country.proto |  6 +-
 .../types/{v1alpha => v1}/credit_card.proto   |  4 +-
 .../cmp/types/{v1alpha => v1}/currency.proto  | 12 ++--
 proto/cmp/types/{v1alpha => v1}/date.proto    |  6 +-
 .../{v1alpha => v1}/datetime_range.proto      |  6 +-
 .../cmp/types/{v1alpha => v1}/delivery.proto  |  6 +-
 .../types/{v1alpha => v1}/description.proto   |  8 +--
 .../cmp/types/{v1alpha => v1}/document.proto  |  6 +-
 proto/cmp/types/{v1alpha => v1}/dow.proto     |  6 +-
 .../cmp/types/{v1alpha => v1}/duration.proto  |  6 +-
 proto/cmp/types/{v1alpha => v1}/email.proto   |  6 +-
 proto/cmp/types/{v1alpha => v1}/file.proto    |  6 +-
 proto/cmp/types/{v1alpha => v1}/filter.proto  |  6 +-
 .../cmp/types/{v1alpha => v1}/language.proto  |  6 +-
 proto/cmp/types/{v1alpha => v1}/link.proto    |  6 +-
 .../cmp/types/{v1alpha => v1}/localized.proto |  4 +-
 .../cmp/types/{v1alpha => v1}/location.proto  | 16 ++---
 .../cmp/types/{v1alpha => v1}/meal_plan.proto |  6 +-
 .../types/{v1alpha => v1}/measurement.proto   |  6 +-
 proto/cmp/types/{v1alpha => v1}/partner.proto | 20 +++---
 proto/cmp/types/{v1alpha => v1}/payment.proto |  4 +-
 proto/cmp/types/{v1alpha => v1}/phone.proto   |  6 +-
 proto/cmp/types/{v1alpha => v1}/price.proto   | 10 +--
 .../types/{v1alpha => v1}/price_type.proto    |  2 +-
 .../types/{v1alpha => v1}/product_code.proto  |  6 +-
 .../{v1alpha => v1}/product_status.proto      |  6 +-
 proto/cmp/types/{v1alpha => v1}/pubkey.proto  |  2 +-
 proto/cmp/types/{v1alpha => v1}/rate.proto    |  6 +-
 .../types/{v1alpha => v1}/redemption.proto    |  6 +-
 proto/cmp/types/{v1alpha => v1}/search.proto  | 20 +++---
 .../cmp/types/{v1alpha => v1}/seat_map.proto  | 24 +++----
 .../types/{v1alpha => v1}/service_fact.proto  |  8 +--
 proto/cmp/types/{v1alpha => v1}/sorting.proto |  6 +-
 proto/cmp/types/{v1alpha => v1}/time.proto    |  6 +-
 proto/cmp/types/{v1alpha => v1}/token.proto   |  6 +-
 .../types/{v1alpha => v1}/travel_period.proto | 16 ++---
 .../types/{v1alpha => v1}/travel_type.proto   |  2 +-
 .../cmp/types/{v1alpha => v1}/traveller.proto | 22 +++---
 proto/cmp/types/{v1alpha => v1}/uuid.proto    |  6 +-
 proto/cmp/types/{v1alpha => v1}/wallet.proto  |  6 +-
 proto/cmp/types/v1alpha/contact_info.proto    | 26 -------
 78 files changed, 627 insertions(+), 627 deletions(-)
 rename proto/cmp/services/accommodation/{v1alpha => v1}/info.proto (57%)
 rename proto/cmp/services/accommodation/{v1alpha => v1}/list.proto (66%)
 rename proto/cmp/services/accommodation/{v1alpha => v1}/property_types.proto (70%)
 rename proto/cmp/services/accommodation/{v1alpha => v1}/search.proto (87%)
 rename proto/cmp/services/accommodation/{v1alpha => v1}/search_parameters_types.proto (53%)
 rename proto/cmp/services/accommodation/{v1alpha => v1}/search_query_types.proto (57%)
 rename proto/cmp/services/accommodation/{v1alpha => v1}/search_result_types.proto (57%)
 rename proto/cmp/services/accommodation/{v1alpha => v1}/unit_types.proto (70%)
 rename proto/cmp/services/activity/{v1alpha => v1}/activity_types.proto (77%)
 rename proto/cmp/services/activity/{v1alpha => v1}/info.proto (60%)
 rename proto/cmp/services/activity/{v1alpha => v1}/list.proto (67%)
 rename proto/cmp/services/activity/{v1alpha => v1}/search.proto (78%)
 rename proto/cmp/services/activity/{v1alpha => v1}/search_parameters_types.proto (69%)
 rename proto/cmp/services/activity/{v1alpha => v1}/search_result_types.proto (60%)
 rename proto/cmp/services/book/{v1alpha => v1}/mint.proto (66%)
 rename proto/cmp/services/book/{v1alpha => v1}/validate.proto (62%)
 rename proto/cmp/services/info/{v1alpha => v1}/entry_requirements.proto (62%)
 rename proto/cmp/services/network/{v1alpha => v1}/fee.proto (80%)
 rename proto/cmp/services/partner/{v1alpha => v1}/partner_configuration.proto (83%)
 rename proto/cmp/services/ping/{v1alpha => v1}/ping.proto (74%)
 rename proto/cmp/services/seat_map/{v1alpha => v1}/availability.proto (74%)
 rename proto/cmp/services/seat_map/{v1alpha => v1}/seat_map.proto (67%)
 rename proto/cmp/services/transport/{v1alpha => v1}/search.proto (66%)
 rename proto/cmp/services/transport/{v1alpha => v1}/search_parameters_types.proto (59%)
 rename proto/cmp/services/transport/{v1alpha => v1}/search_query_types.proto (72%)
 rename proto/cmp/services/transport/{v1alpha => v1}/search_result_types.proto (62%)
 rename proto/cmp/services/transport/{v1alpha => v1}/trip_types.proto (79%)
 rename proto/cmp/types/{v1alpha => v1}/address.proto (65%)
 rename proto/cmp/types/{v1alpha => v1}/amenity.proto (88%)
 rename proto/cmp/types/{v1alpha => v1}/baggage.proto (87%)
 rename proto/cmp/types/{v1alpha => v1}/bed.proto (69%)
 rename proto/cmp/types/{v1alpha => v1}/bookability.proto (71%)
 rename proto/cmp/types/{v1alpha => v1}/cancel_policy.proto (86%)
 rename proto/cmp/types/{v1alpha => v1}/change_policy.proto (86%)
 rename proto/cmp/types/{v1alpha => v1}/common.proto (95%)
 create mode 100644 proto/cmp/types/v1/contact_info.proto
 rename proto/cmp/types/{v1alpha => v1}/content_source.proto (75%)
 rename proto/cmp/types/{v1alpha => v1}/country.proto (98%)
 rename proto/cmp/types/{v1alpha => v1}/credit_card.proto (72%)
 rename proto/cmp/types/{v1alpha => v1}/currency.proto (96%)
 rename proto/cmp/types/{v1alpha => v1}/date.proto (67%)
 rename proto/cmp/types/{v1alpha => v1}/datetime_range.proto (70%)
 rename proto/cmp/types/{v1alpha => v1}/delivery.proto (80%)
 rename proto/cmp/types/{v1alpha => v1}/description.proto (71%)
 rename proto/cmp/types/{v1alpha => v1}/document.proto (89%)
 rename proto/cmp/types/{v1alpha => v1}/dow.proto (91%)
 rename proto/cmp/types/{v1alpha => v1}/duration.proto (71%)
 rename proto/cmp/types/{v1alpha => v1}/email.proto (91%)
 rename proto/cmp/types/{v1alpha => v1}/file.proto (88%)
 rename proto/cmp/types/{v1alpha => v1}/filter.proto (94%)
 rename proto/cmp/types/{v1alpha => v1}/language.proto (97%)
 rename proto/cmp/types/{v1alpha => v1}/link.proto (87%)
 rename proto/cmp/types/{v1alpha => v1}/localized.proto (57%)
 rename proto/cmp/types/{v1alpha => v1}/location.proto (88%)
 rename proto/cmp/types/{v1alpha => v1}/meal_plan.proto (89%)
 rename proto/cmp/types/{v1alpha => v1}/measurement.proto (86%)
 rename proto/cmp/types/{v1alpha => v1}/partner.proto (88%)
 rename proto/cmp/types/{v1alpha => v1}/payment.proto (72%)
 rename proto/cmp/types/{v1alpha => v1}/phone.proto (90%)
 rename proto/cmp/types/{v1alpha => v1}/price.proto (93%)
 rename proto/cmp/types/{v1alpha => v1}/price_type.proto (99%)
 rename proto/cmp/types/{v1alpha => v1}/product_code.proto (94%)
 rename proto/cmp/types/{v1alpha => v1}/product_status.proto (72%)
 rename proto/cmp/types/{v1alpha => v1}/pubkey.proto (69%)
 rename proto/cmp/types/{v1alpha => v1}/rate.proto (95%)
 rename proto/cmp/types/{v1alpha => v1}/redemption.proto (70%)
 rename proto/cmp/types/{v1alpha => v1}/search.proto (89%)
 rename proto/cmp/types/{v1alpha => v1}/seat_map.proto (92%)
 rename proto/cmp/types/{v1alpha => v1}/service_fact.proto (94%)
 rename proto/cmp/types/{v1alpha => v1}/sorting.proto (82%)
 rename proto/cmp/types/{v1alpha => v1}/time.proto (61%)
 rename proto/cmp/types/{v1alpha => v1}/token.proto (77%)
 rename proto/cmp/types/{v1alpha => v1}/travel_period.proto (84%)
 rename proto/cmp/types/{v1alpha => v1}/travel_type.proto (87%)
 rename proto/cmp/types/{v1alpha => v1}/traveller.proto (84%)
 rename proto/cmp/types/{v1alpha => v1}/uuid.proto (66%)
 rename proto/cmp/types/{v1alpha => v1}/wallet.proto (79%)
 delete mode 100644 proto/cmp/types/v1alpha/contact_info.proto

diff --git a/proto/cmp/services/accommodation/v1alpha/info.proto b/proto/cmp/services/accommodation/v1/info.proto
similarity index 57%
rename from proto/cmp/services/accommodation/v1alpha/info.proto
rename to proto/cmp/services/accommodation/v1/info.proto
index 2603184d..09aead94 100644
--- a/proto/cmp/services/accommodation/v1alpha/info.proto
+++ b/proto/cmp/services/accommodation/v1/info.proto
@@ -1,30 +1,30 @@
 syntax = "proto3";
 
-package cmp.services.accommodation.v1alpha;
+package cmp.services.accommodation.v1;
 
-import "cmp/services/accommodation/v1alpha/property_types.proto";
-import "cmp/types/v1alpha/common.proto";
-import "cmp/types/v1alpha/language.proto";
-import "cmp/types/v1alpha/product_code.proto";
+import "cmp/services/accommodation/v1/property_types.proto";
+import "cmp/types/v1/common.proto";
+import "cmp/types/v1/language.proto";
+import "cmp/types/v1/product_code.proto";
 import "google/protobuf/timestamp.proto";
 
 message AccommodationProductInfoRequest {
   // Message header
-  cmp.types.v1alpha.RequestHeader header = 1;
+  cmp.types.v1.RequestHeader header = 1;
 
   // Only respond with the products that are modified after this timestamp
   google.protobuf.Timestamp modified_after = 2;
 
   // Languages
-  repeated cmp.types.v1alpha.Language languages = 3;
+  repeated cmp.types.v1.Language languages = 3;
 
   // Property codes
-  repeated cmp.types.v1alpha.SupplierProductCode supplier_codes = 4;
+  repeated cmp.types.v1.SupplierProductCode supplier_codes = 4;
 }
 
 message AccommodationProductInfoResponse {
   // Message header
-  cmp.types.v1alpha.ResponseHeader header = 1;
+  cmp.types.v1.ResponseHeader header = 1;
 
   // Product list: Properties
   repeated PropertyExtendedInfo properties = 2;
@@ -32,8 +32,8 @@ message AccommodationProductInfoResponse {
 
 // Accommodation product info service definition
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1alpha/info.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1alpha/info.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1/info.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1/info.proto.dot.svg)
 service AccommodationProductInfoService {
   // Returns product list for accommodation (properties)
   rpc AccommodationProductInfo(AccommodationProductInfoRequest) returns (AccommodationProductInfoResponse);
diff --git a/proto/cmp/services/accommodation/v1alpha/list.proto b/proto/cmp/services/accommodation/v1/list.proto
similarity index 66%
rename from proto/cmp/services/accommodation/v1alpha/list.proto
rename to proto/cmp/services/accommodation/v1/list.proto
index 1f903cc6..ae4a89df 100644
--- a/proto/cmp/services/accommodation/v1alpha/list.proto
+++ b/proto/cmp/services/accommodation/v1/list.proto
@@ -1,14 +1,14 @@
 syntax = "proto3";
 
-package cmp.services.accommodation.v1alpha;
+package cmp.services.accommodation.v1;
 
-import "cmp/services/accommodation/v1alpha/property_types.proto";
-import "cmp/types/v1alpha/common.proto";
+import "cmp/services/accommodation/v1/property_types.proto";
+import "cmp/types/v1/common.proto";
 import "google/protobuf/timestamp.proto";
 
 message AccommodationProductListRequest {
   // Message header
-  cmp.types.v1alpha.RequestHeader header = 1;
+  cmp.types.v1.RequestHeader header = 1;
 
   // Only respond with the products that are modified after this timestamp
   google.protobuf.Timestamp modified_after = 2;
@@ -16,7 +16,7 @@ message AccommodationProductListRequest {
 
 message AccommodationProductListResponse {
   // Message header
-  cmp.types.v1alpha.ResponseHeader header = 1;
+  cmp.types.v1.ResponseHeader header = 1;
 
   // Product list: Properties
   repeated Property properties = 2;
@@ -24,8 +24,8 @@ message AccommodationProductListResponse {
 
 // Accommodation product list service definition
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1alpha/list.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1alpha/list.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1/list.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1/list.proto.dot.svg)
 service AccommodationProductListService {
   // Returns product list for accommodation (properties)
   rpc AccommodationProductList(AccommodationProductListRequest) returns (AccommodationProductListResponse);
diff --git a/proto/cmp/services/accommodation/v1alpha/property_types.proto b/proto/cmp/services/accommodation/v1/property_types.proto
similarity index 70%
rename from proto/cmp/services/accommodation/v1alpha/property_types.proto
rename to proto/cmp/services/accommodation/v1/property_types.proto
index a8b40ecc..693648d5 100644
--- a/proto/cmp/services/accommodation/v1alpha/property_types.proto
+++ b/proto/cmp/services/accommodation/v1/property_types.proto
@@ -1,34 +1,34 @@
 syntax = "proto3";
 
-package cmp.services.accommodation.v1alpha;
-
-import "cmp/types/v1alpha/amenity.proto";
-import "cmp/types/v1alpha/bed.proto";
-import "cmp/types/v1alpha/contact_info.proto";
-import "cmp/types/v1alpha/description.proto";
-import "cmp/types/v1alpha/file.proto";
-import "cmp/types/v1alpha/location.proto";
-import "cmp/types/v1alpha/meal_plan.proto";
-import "cmp/types/v1alpha/product_code.proto";
-import "cmp/types/v1alpha/product_status.proto";
-import "cmp/types/v1alpha/service_fact.proto";
-import "cmp/types/v1alpha/traveller.proto";
+package cmp.services.accommodation.v1;
+
+import "cmp/types/v1/amenity.proto";
+import "cmp/types/v1/bed.proto";
+import "cmp/types/v1/contact_info.proto";
+import "cmp/types/v1/description.proto";
+import "cmp/types/v1/file.proto";
+import "cmp/types/v1/location.proto";
+import "cmp/types/v1/meal_plan.proto";
+import "cmp/types/v1/product_code.proto";
+import "cmp/types/v1/product_status.proto";
+import "cmp/types/v1/service_fact.proto";
+import "cmp/types/v1/traveller.proto";
 import "google/protobuf/timestamp.proto";
 
 // Represents property info for an accommodation product
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1alpha/property_types.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1alpha/property_types.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1/property_types.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1/property_types.proto.dot.svg)
 message Property {
   // Ex: "2023-08-28T12:03:50", specifying when the static data of a product was
   // last updated
   google.protobuf.Timestamp last_modified = 1;
 
   // Supplier product Code
-  cmp.types.v1alpha.SupplierProductCode supplier_code = 2;
+  cmp.types.v1.SupplierProductCode supplier_code = 2;
 
   // Product code which can be of different types
-  repeated cmp.types.v1alpha.ProductCode product_codes = 3;
+  repeated cmp.types.v1.ProductCode product_codes = 3;
 
   // Ex: "Beach Hotel Alanya"
   string name = 4;
@@ -43,13 +43,13 @@ message Property {
   CategoryUnit category_unit = 7;
 
   // Contact Info: phone, address, email, links
-  cmp.types.v1alpha.ContactInfo contact_info = 8;
+  cmp.types.v1.ContactInfo contact_info = 8;
 
   // Location coordinate
-  cmp.types.v1alpha.Coordinates coordinates = 9;
+  cmp.types.v1.Coordinates coordinates = 9;
 
   // Status of the property
-  cmp.types.v1alpha.ProductStatus status = 10;
+  cmp.types.v1.ProductStatus status = 10;
 
   // Airports
   // Ex: ["PMI", "ZRH", "AYT"]
@@ -92,19 +92,19 @@ message PropertyExtendedInfo {
   Property property = 1;
 
   // Images
-  repeated cmp.types.v1alpha.Image images = 2;
+  repeated cmp.types.v1.Image images = 2;
 
   // Videos
-  repeated cmp.types.v1alpha.Video videos = 3;
+  repeated cmp.types.v1.Video videos = 3;
 
   // Segmentation classification
   repeated string classifications = 4;
 
   // Property descriptions
-  repeated cmp.types.v1alpha.LocalizedDescriptionSet localized_descriptions = 5;
+  repeated cmp.types.v1.LocalizedDescriptionSet localized_descriptions = 5;
 
   // Room descriptions
-  repeated cmp.types.v1alpha.LocalizedDescriptionSet localized_room_descriptions = 6;
+  repeated cmp.types.v1.LocalizedDescriptionSet localized_room_descriptions = 6;
 
   // Payment type. Ex: "MERCHANT"
   string payment_type = 7;
@@ -133,26 +133,26 @@ message Room {
   // For holiday homes specific room names if availbale can be given.
   string original_name = 3;
 
-  repeated cmp.types.v1alpha.Image images = 4;
-  repeated cmp.types.v1alpha.Video videos = 5;
+  repeated cmp.types.v1.Image images = 4;
+  repeated cmp.types.v1.Video videos = 5;
 
   // Room descriptions
-  repeated cmp.types.v1alpha.LocalizedDescriptionSet descriptions = 6;
+  repeated cmp.types.v1.LocalizedDescriptionSet descriptions = 6;
 
   // Meal plan (Board code)
-  repeated cmp.types.v1alpha.MealPlan meal_plans = 7;
+  repeated cmp.types.v1.MealPlan meal_plans = 7;
 
   // Beds
-  repeated cmp.types.v1alpha.Bed beds = 8;
+  repeated cmp.types.v1.Bed beds = 8;
 
   // Occupancy
   Occupancy total_occupancy = 9;
 
   // Services
-  repeated cmp.types.v1alpha.ServiceFact services = 10;
+  repeated cmp.types.v1.ServiceFact services = 10;
 
   // Amenities
-  repeated cmp.types.v1alpha.Amenity amenities = 11;
+  repeated cmp.types.v1.Amenity amenities = 11;
 }
 
 message Occupancy {
@@ -177,7 +177,7 @@ message Occupancy {
 
 message OccupancyOption {
   // Guest type like adult, child, infant.
-  cmp.types.v1alpha.TravellerType guest_type = 1;
+  cmp.types.v1.TravellerType guest_type = 1;
 
   // Min guests
   int32 min = 2;
diff --git a/proto/cmp/services/accommodation/v1alpha/search.proto b/proto/cmp/services/accommodation/v1/search.proto
similarity index 87%
rename from proto/cmp/services/accommodation/v1alpha/search.proto
rename to proto/cmp/services/accommodation/v1/search.proto
index b04e1a70..93457a05 100644
--- a/proto/cmp/services/accommodation/v1alpha/search.proto
+++ b/proto/cmp/services/accommodation/v1/search.proto
@@ -10,13 +10,13 @@ syntax = "proto3";
 // and Product Details messages.
 //
 // This package is a **WIP**.
-package cmp.services.accommodation.v1alpha;
+package cmp.services.accommodation.v1;
 
-import "cmp/services/accommodation/v1alpha/search_query_types.proto";
-import "cmp/services/accommodation/v1alpha/search_result_types.proto";
-import "cmp/types/v1alpha/common.proto";
-import "cmp/types/v1alpha/search.proto";
-import "cmp/types/v1alpha/traveller.proto";
+import "cmp/services/accommodation/v1/search_query_types.proto";
+import "cmp/services/accommodation/v1/search_result_types.proto";
+import "cmp/types/v1/common.proto";
+import "cmp/types/v1/search.proto";
+import "cmp/types/v1/traveller.proto";
 
 // The `Accommodation Search Request` message type facilitates the request for
 // accommodations like hotel and holiday home searches within the platform. In the
@@ -73,17 +73,17 @@ import "cmp/types/v1alpha/traveller.proto";
 message AccommodationSearchRequest {
   // Message header. Contains API version, message info string and end-user wallet
   // address
-  cmp.types.v1alpha.RequestHeader header = 1;
+  cmp.types.v1.RequestHeader header = 1;
 
   // Search request metadata
-  cmp.types.v1alpha.SearchRequestMetadata metadata = 2;
+  cmp.types.v1.SearchRequestMetadata metadata = 2;
 
   // Generic search parameters Ex: Inclusion of OnRequest options and inclusion of
   // only the cheapest or all options.
   // In the search parameters multiple filters can be applied for upfront filtering
   // of the search results to for example to only include hotels that are less than
   // one kilometer from the beach, have a kids club and offer an a la carte restaurant
-  cmp.types.v1alpha.SearchParameters search_parameters_generic = 3;
+  cmp.types.v1.SearchParameters search_parameters_generic = 3;
 
   // This field represents a list of search queries that can be used to create
   // multiroom multi location searches.
@@ -100,22 +100,22 @@ message AccommodationSearchRequest {
 message AccommodationSearchResponse {
   // Message header. Contains API version, message info string and end user wallet
   // address.
-  cmp.types.v1alpha.ResponseHeader header = 1;
+  cmp.types.v1.ResponseHeader header = 1;
 
   // Search response metadata
-  cmp.types.v1alpha.SearchResponseMetadata metadata = 2;
+  cmp.types.v1.SearchResponseMetadata metadata = 2;
 
   // Unique combinations of bookable search results, like property,
   repeated AccommodationSearchResult results = 3;
 
   // Global definition of the travellers for all results to be used via the traveller_id each unit.
-  repeated cmp.types.v1alpha.BasicTraveller travellers = 4;
+  repeated cmp.types.v1.BasicTraveller travellers = 4;
 }
 
 // Service definition for Accommodation search
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1alpha/search.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1alpha/search.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1/search.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1/search.proto.dot.svg)
 service AccommodationSearchService {
   // Accommodation Search method
   rpc AccommodationSearch(AccommodationSearchRequest) returns (AccommodationSearchResponse);
diff --git a/proto/cmp/services/accommodation/v1alpha/search_parameters_types.proto b/proto/cmp/services/accommodation/v1/search_parameters_types.proto
similarity index 53%
rename from proto/cmp/services/accommodation/v1alpha/search_parameters_types.proto
rename to proto/cmp/services/accommodation/v1/search_parameters_types.proto
index 1fe257df..6b847f83 100644
--- a/proto/cmp/services/accommodation/v1alpha/search_parameters_types.proto
+++ b/proto/cmp/services/accommodation/v1/search_parameters_types.proto
@@ -1,17 +1,17 @@
 syntax = "proto3";
 
-package cmp.services.accommodation.v1alpha;
+package cmp.services.accommodation.v1;
 
-import "cmp/types/v1alpha/location.proto";
-import "cmp/types/v1alpha/meal_plan.proto";
-import "cmp/types/v1alpha/product_code.proto";
-import "cmp/types/v1alpha/rate.proto";
+import "cmp/types/v1/location.proto";
+import "cmp/types/v1/meal_plan.proto";
+import "cmp/types/v1/product_code.proto";
+import "cmp/types/v1/rate.proto";
 
 // This type is used in search requests for parameters like location, meal plan
 // codes etc.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1alpha/search_parameters_types.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1alpha/search_parameters_types.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1/search_parameters_types.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1/search_parameters_types.proto.dot.svg)
 message AccommodationSearchParameters {
   // Geo Location for search, set only one of the fields at once.
   //
@@ -19,35 +19,35 @@ message AccommodationSearchParameters {
   // memory, setting one will remove the others.
   oneof geo_location {
     // A list of location codes or just one code.
-    cmp.types.v1alpha.LocationCodes location_codes = 1;
+    cmp.types.v1.LocationCodes location_codes = 1;
 
     // Single geographic point represented by two double fields.
-    cmp.types.v1alpha.Coordinates location_coordinates = 2;
+    cmp.types.v1.Coordinates location_coordinates = 2;
 
     // Geo tree type, represented by Country, Region, and City_or_Resort.
-    cmp.types.v1alpha.GeoTree location_geo_tree = 3;
+    cmp.types.v1.GeoTree location_geo_tree = 3;
 
     // Geo circle. Represented by a coordinate and a distance for radius
-    cmp.types.v1alpha.GeoCircle location_geo_circle = 4;
+    cmp.types.v1.GeoCircle location_geo_circle = 4;
 
     // Geo polygon. Represented by a list of coordinate points.
-    cmp.types.v1alpha.GeoPolygon location_geo_polygon = 5;
+    cmp.types.v1.GeoPolygon location_geo_polygon = 5;
   }
 
   // Mealplan codes
-  repeated cmp.types.v1alpha.MealPlan meal_plan_codes = 6;
+  repeated cmp.types.v1.MealPlan meal_plan_codes = 6;
 
   // Rate plans
-  repeated cmp.types.v1alpha.RatePlan rate_plans = 7;
+  repeated cmp.types.v1.RatePlan rate_plans = 7;
 
   // Rate Rules
   // To be used when searching for specific rates like refundable or resellable offers
-  repeated cmp.types.v1alpha.RateRule rate_rules = 8;
+  repeated cmp.types.v1.RateRule rate_rules = 8;
 
   // Product code list
   // Here a list of property codes would be used that could be of different types
-  repeated cmp.types.v1alpha.ProductCode product_codes = 9;
+  repeated cmp.types.v1.ProductCode product_codes = 9;
 
   // Or a list of provider codes would be used
-  repeated cmp.types.v1alpha.SupplierProductCode supplier_codes = 10;
+  repeated cmp.types.v1.SupplierProductCode supplier_codes = 10;
 }
diff --git a/proto/cmp/services/accommodation/v1alpha/search_query_types.proto b/proto/cmp/services/accommodation/v1/search_query_types.proto
similarity index 57%
rename from proto/cmp/services/accommodation/v1alpha/search_query_types.proto
rename to proto/cmp/services/accommodation/v1/search_query_types.proto
index 64a95c0e..e1309f6d 100644
--- a/proto/cmp/services/accommodation/v1alpha/search_query_types.proto
+++ b/proto/cmp/services/accommodation/v1/search_query_types.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.services.accommodation.v1alpha;
+package cmp.services.accommodation.v1;
 
-import "cmp/services/accommodation/v1alpha/search_parameters_types.proto";
-import "cmp/services/accommodation/v1alpha/unit_types.proto";
-import "cmp/types/v1alpha/travel_period.proto";
-import "cmp/types/v1alpha/traveller.proto";
+import "cmp/services/accommodation/v1/search_parameters_types.proto";
+import "cmp/services/accommodation/v1/unit_types.proto";
+import "cmp/types/v1/travel_period.proto";
+import "cmp/types/v1/traveller.proto";
 
 message AccommodationSearchQuery {
   // Integer query ID, unique per search request
@@ -16,10 +16,10 @@ message AccommodationSearchQuery {
   AccommodationSearchParameters search_parameters_accommodation = 2;
 
   // Travel period
-  cmp.types.v1alpha.TravelPeriod travel_period = 3;
+  cmp.types.v1.TravelPeriod travel_period = 3;
 
   // Travellers
-  repeated cmp.types.v1alpha.BasicTraveller travellers = 4;
+  repeated cmp.types.v1.BasicTraveller travellers = 4;
 
   // Total number of rooms / holiday homes
   int32 unit_count = 5;
diff --git a/proto/cmp/services/accommodation/v1alpha/search_result_types.proto b/proto/cmp/services/accommodation/v1/search_result_types.proto
similarity index 57%
rename from proto/cmp/services/accommodation/v1alpha/search_result_types.proto
rename to proto/cmp/services/accommodation/v1/search_result_types.proto
index a950efec..15d2061a 100644
--- a/proto/cmp/services/accommodation/v1alpha/search_result_types.proto
+++ b/proto/cmp/services/accommodation/v1/search_result_types.proto
@@ -1,18 +1,18 @@
 syntax = "proto3";
 
-package cmp.services.accommodation.v1alpha;
+package cmp.services.accommodation.v1;
 
-import "cmp/services/accommodation/v1alpha/unit_types.proto";
-import "cmp/types/v1alpha/bookability.proto";
-import "cmp/types/v1alpha/cancel_policy.proto";
-import "cmp/types/v1alpha/price.proto";
-import "cmp/types/v1alpha/rate.proto";
+import "cmp/services/accommodation/v1/unit_types.proto";
+import "cmp/types/v1/bookability.proto";
+import "cmp/types/v1/cancel_policy.proto";
+import "cmp/types/v1/price.proto";
+import "cmp/types/v1/rate.proto";
 
 // This type represents a search result and is used in the
 // `AccommodationSearchResponse` message.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1alpha/search_result_types.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1alpha/search_result_types.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1/search_result_types.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1/search_result_types.proto.dot.svg)
 message AccommodationSearchResult {
   // ID for the search result. This is an increasing number starting at 0 and
   // increasing by 1 for every search result.
@@ -25,17 +25,17 @@ message AccommodationSearchResult {
   repeated Unit units = 3;
 
   // ## Total price in detail, with breakdowns
-  cmp.types.v1alpha.PriceDetail total_price_detail = 4;
+  cmp.types.v1.PriceDetail total_price_detail = 4;
 
   // The RateRule specifies whether a search result is non-refundable or not
-  repeated cmp.types.v1alpha.RateRule rate_rules = 5;
+  repeated cmp.types.v1.RateRule rate_rules = 5;
 
   // The cancellation conditions related to an option
-  cmp.types.v1alpha.CancelPolicy cancel_policy = 6;
+  cmp.types.v1.CancelPolicy cancel_policy = 6;
 
   // Freetext remarks without any functionality
   string remarks = 7;
 
   // Status of the result, whether it is immediately bookable or not
-  cmp.types.v1alpha.Bookability bookability = 8;
+  cmp.types.v1.Bookability bookability = 8;
 }
diff --git a/proto/cmp/services/accommodation/v1alpha/unit_types.proto b/proto/cmp/services/accommodation/v1/unit_types.proto
similarity index 70%
rename from proto/cmp/services/accommodation/v1alpha/unit_types.proto
rename to proto/cmp/services/accommodation/v1/unit_types.proto
index f4d4dcf9..8a34219a 100644
--- a/proto/cmp/services/accommodation/v1alpha/unit_types.proto
+++ b/proto/cmp/services/accommodation/v1/unit_types.proto
@@ -1,15 +1,15 @@
 syntax = "proto3";
 
-package cmp.services.accommodation.v1alpha;
+package cmp.services.accommodation.v1;
 
-import "cmp/types/v1alpha/bed.proto";
-import "cmp/types/v1alpha/cancel_policy.proto";
-import "cmp/types/v1alpha/meal_plan.proto";
-import "cmp/types/v1alpha/price.proto";
-import "cmp/types/v1alpha/product_code.proto";
-import "cmp/types/v1alpha/rate.proto";
-import "cmp/types/v1alpha/service_fact.proto";
-import "cmp/types/v1alpha/travel_period.proto";
+import "cmp/types/v1/bed.proto";
+import "cmp/types/v1/cancel_policy.proto";
+import "cmp/types/v1/meal_plan.proto";
+import "cmp/types/v1/price.proto";
+import "cmp/types/v1/product_code.proto";
+import "cmp/types/v1/rate.proto";
+import "cmp/types/v1/service_fact.proto";
+import "cmp/types/v1/travel_period.proto";
 
 // A Unit can represent a room in a hotel. One search option can have multiple units
 // for multi-room requests Ex: one request for 2 rooms for 4 adults, 2 in each room.
@@ -17,8 +17,8 @@ import "cmp/types/v1alpha/travel_period.proto";
 // A unit can also be a different property in a multi-property request for holiday
 // homes. Ex: 1 house for 4 persons and another house for 6 persons.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1alpha/unit_types.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1alpha/unit_types.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1/unit_types.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/accommodation/v1/unit_types.proto.dot.svg)
 message Unit {
   // Unit Type. Used to distinguish between hotel rooms and holiday homes.
   // Ex: `UnitType.UNIT_TYPE_ROOM`
@@ -42,44 +42,44 @@ message Unit {
   string original_room_name = 4;
 
   // Travel period
-  cmp.types.v1alpha.TravelPeriod travel_period = 5;
+  cmp.types.v1.TravelPeriod travel_period = 5;
 
   // Traveller_id is a list of travellers related to this unit. The details can be found in
   // the search response repeated travellers field
   repeated int32 traveller_ids = 6;
 
   // Beds
-  repeated cmp.types.v1alpha.Bed beds = 7;
+  repeated cmp.types.v1.Bed beds = 7;
 
   // Price in detail with breakdowns
-  cmp.types.v1alpha.PriceDetail price_detail = 8;
+  cmp.types.v1.PriceDetail price_detail = 8;
 
   // Included, compulsory and optional services available
-  repeated cmp.types.v1alpha.ServiceFact services = 9;
+  repeated cmp.types.v1.ServiceFact services = 9;
 
   // Mealplan code
-  cmp.types.v1alpha.MealPlan meal_plan_code = 10;
+  cmp.types.v1.MealPlan meal_plan_code = 10;
 
   // Rate plan
-  cmp.types.v1alpha.RatePlan rate_plan = 11;
+  cmp.types.v1.RatePlan rate_plan = 11;
 
   // Rate Rule
-  cmp.types.v1alpha.RateRule rate_rule = 12;
+  cmp.types.v1.RateRule rate_rule = 12;
 
   // This is a list so that various policies can be expressed.
   //
   // Ex: 10-5 days before arrival x€, 4-1 days before arrival y€ and 0 days before
   // arrival z€
-  repeated cmp.types.v1alpha.CancelPolicy cancel_policies = 13;
+  repeated cmp.types.v1.CancelPolicy cancel_policies = 13;
 
   // Number of remaining units at the time of calculation
   int32 remaining_units = 14;
 
   // Property code which can be of different types
-  cmp.types.v1alpha.ProductCode property_code = 15;
+  cmp.types.v1.ProductCode property_code = 15;
 
   // Supplier Property code, consistent in ProductList, ProductInfo and Search
-  cmp.types.v1alpha.SupplierProductCode supplier_code = 16;
+  cmp.types.v1.SupplierProductCode supplier_code = 16;
 
   // Remarks
   // Non structural aspects related to the unit a supplier wants to include in the search
diff --git a/proto/cmp/services/activity/v1alpha/activity_types.proto b/proto/cmp/services/activity/v1/activity_types.proto
similarity index 77%
rename from proto/cmp/services/activity/v1alpha/activity_types.proto
rename to proto/cmp/services/activity/v1/activity_types.proto
index 48a8ea66..eb6c78cb 100644
--- a/proto/cmp/services/activity/v1alpha/activity_types.proto
+++ b/proto/cmp/services/activity/v1/activity_types.proto
@@ -1,25 +1,25 @@
 syntax = "proto3";
 
-package cmp.services.activity.v1alpha;
-
-import "cmp/types/v1alpha/address.proto";
-import "cmp/types/v1alpha/bookability.proto";
-import "cmp/types/v1alpha/contact_info.proto";
-import "cmp/types/v1alpha/datetime_range.proto";
-import "cmp/types/v1alpha/delivery.proto";
-import "cmp/types/v1alpha/description.proto";
-import "cmp/types/v1alpha/duration.proto";
-import "cmp/types/v1alpha/file.proto";
-import "cmp/types/v1alpha/language.proto";
-import "cmp/types/v1alpha/location.proto";
-import "cmp/types/v1alpha/product_code.proto";
-import "cmp/types/v1alpha/redemption.proto";
+package cmp.services.activity.v1;
+
+import "cmp/types/v1/address.proto";
+import "cmp/types/v1/bookability.proto";
+import "cmp/types/v1/contact_info.proto";
+import "cmp/types/v1/datetime_range.proto";
+import "cmp/types/v1/delivery.proto";
+import "cmp/types/v1/description.proto";
+import "cmp/types/v1/duration.proto";
+import "cmp/types/v1/file.proto";
+import "cmp/types/v1/language.proto";
+import "cmp/types/v1/location.proto";
+import "cmp/types/v1/product_code.proto";
+import "cmp/types/v1/redemption.proto";
 import "google/protobuf/timestamp.proto";
 
 // This represents Activity types which is needed for different activity services (search, info, ... etc)
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1alpha/activity_types.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1alpha/activity_types.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1/activity_types.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1/activity_types.proto.dot.svg)
 message Activity {
   // Context for Inventory system concepts that need to be included in an info
   // response, like an OwnerCode, PTC_OfferParameters, Tax codes, Disclosure RefID,
@@ -35,7 +35,7 @@ message Activity {
   string external_session_id = 3;
 
   // External Product codes for the result. These can be of different types
-  cmp.types.v1alpha.ProductCode product_code = 4;
+  cmp.types.v1.ProductCode product_code = 4;
 
   // Unit ID for the result
   //
@@ -53,18 +53,18 @@ message Activity {
   string service_code = 6;
 
   // Status of the result, whether it is immediately bookable or not
-  cmp.types.v1alpha.Bookability bookability = 7;
+  cmp.types.v1.Bookability bookability = 7;
 }
 
 message ActivityLocation {
   // Ex: Ctra. de la Porrassa, s/n, Magaluf, ES 07181 in structured fields
-  cmp.types.v1alpha.Address address = 1;
+  cmp.types.v1.Address address = 1;
 
   // Geo Tree. Country, region, city_or_resort
-  cmp.types.v1alpha.GeoTree geo_tree = 2;
+  cmp.types.v1.GeoTree geo_tree = 2;
 
   // Coordinate
-  cmp.types.v1alpha.Coordinates coordinates = 3;
+  cmp.types.v1.Coordinates coordinates = 3;
 }
 
 message PickupDropoffEvent {
@@ -92,7 +92,7 @@ message PickupDropoffEvent {
   google.protobuf.Timestamp date_time = 5;
 
   // Longitude and Latitude of the location
-  cmp.types.v1alpha.Coordinates coordinates = 6;
+  cmp.types.v1.Coordinates coordinates = 6;
 }
 
 // Activity static info
@@ -111,7 +111,7 @@ message ActivityExtendedInfo {
   repeated TransferZone zones = 4;
 
   // Descriptions with different languages
-  repeated cmp.types.v1alpha.LocalizedDescriptionSet descriptions = 5;
+  repeated cmp.types.v1.LocalizedDescriptionSet descriptions = 5;
 
   // Coordinates of where the activity takes place
   ActivityLocation location = 6;
@@ -123,16 +123,16 @@ message ActivityExtendedInfo {
   repeated ActivityTag tags = 8;
 
   // Languages
-  repeated cmp.types.v1alpha.Language languages = 9;
+  repeated cmp.types.v1.Language languages = 9;
 
   // Contact Info; Address, Email, Phone, Urls
-  cmp.types.v1alpha.ContactInfo contact_info = 10;
+  cmp.types.v1.ContactInfo contact_info = 10;
 
   // Images
-  repeated cmp.types.v1alpha.Image images = 11;
+  repeated cmp.types.v1.Image images = 11;
 
   // Videos
-  repeated cmp.types.v1alpha.Video videos = 12;
+  repeated cmp.types.v1.Video videos = 12;
 
   // Supplier code from the Inventory System for this activity response.
   string supplier_unit_code = 13;
@@ -152,16 +152,16 @@ message ActivityExtendedInfo {
   // Supplier Product codes for the result
   // These must match the supplier codes provided in the ProductList and
   // ProductInfo messages
-  cmp.types.v1alpha.SupplierProductCode supplier_code = 18;
+  cmp.types.v1.SupplierProductCode supplier_code = 18;
 
   // Supplier Name
   string supplier_code_name = 19;
 
   // Duration range (min, max) of the activity in minutes
-  cmp.types.v1alpha.DurationRange duration_range = 20;
+  cmp.types.v1.DurationRange duration_range = 20;
 
   // Time given for confirmation before the offer expires
-  cmp.types.v1alpha.Duration max_confirmation_duration = 21;
+  cmp.types.v1.Duration max_confirmation_duration = 21;
 
   // Allow Free Sale
   bool allow_free_sale = 22;
@@ -179,13 +179,13 @@ message ActivityExtendedInfo {
   string availability_type = 26;
 
   // Delivery Formats; such as QR Code, NFT, Ticket, ... etc
-  repeated cmp.types.v1alpha.DeliveryFormat delivery_formats = 27;
+  repeated cmp.types.v1.DeliveryFormat delivery_formats = 27;
 
   // Delivery Methods; such as Email, SMS, Post, ... etc
-  repeated cmp.types.v1alpha.DeliveryMethod delivery_methods = 28;
+  repeated cmp.types.v1.DeliveryMethod delivery_methods = 28;
 
   // Redemption method
-  repeated cmp.types.v1alpha.RedemptionMethod redemption_methods = 29;
+  repeated cmp.types.v1.RedemptionMethod redemption_methods = 29;
 }
 
 // The unit  gives us a choice of the different options that are available in an
@@ -193,7 +193,7 @@ message ActivityExtendedInfo {
 // jeep safari. A ticket to a specific section of a stadium.
 message ActivityUnit {
   //Schedule
-  cmp.types.v1alpha.DateTimeRange schedule = 1;
+  cmp.types.v1.DateTimeRange schedule = 1;
 
   // Unit Code
   string code = 2;
@@ -230,7 +230,7 @@ message TransferZone {
   string code = 1;
 
   // Geo tree type, represented by Country, Region, and City_or_Resort.
-  cmp.types.v1alpha.GeoTree geo_tree = 2;
+  cmp.types.v1.GeoTree geo_tree = 2;
 
   // pick-up and drop-off information about location and time
   repeated PickupDropoffEvent pickup_dropoff_events = 3;
diff --git a/proto/cmp/services/activity/v1alpha/info.proto b/proto/cmp/services/activity/v1/info.proto
similarity index 60%
rename from proto/cmp/services/activity/v1alpha/info.proto
rename to proto/cmp/services/activity/v1/info.proto
index 81655078..11c63af4 100644
--- a/proto/cmp/services/activity/v1alpha/info.proto
+++ b/proto/cmp/services/activity/v1/info.proto
@@ -1,16 +1,16 @@
 syntax = "proto3";
 
-package cmp.services.activity.v1alpha;
+package cmp.services.activity.v1;
 
-import "cmp/services/activity/v1alpha/activity_types.proto";
-import "cmp/types/v1alpha/common.proto";
-import "cmp/types/v1alpha/language.proto";
-import "cmp/types/v1alpha/product_code.proto";
+import "cmp/services/activity/v1/activity_types.proto";
+import "cmp/types/v1/common.proto";
+import "cmp/types/v1/language.proto";
+import "cmp/types/v1/product_code.proto";
 import "google/protobuf/timestamp.proto";
 
 message ActivityProductInfoRequest {
   // Message header
-  cmp.types.v1alpha.RequestHeader header = 1;
+  cmp.types.v1.RequestHeader header = 1;
 
   // Only respond with the products that are new, modified or deactivated after this
   // timestamp.
@@ -18,15 +18,15 @@ message ActivityProductInfoRequest {
 
   // Languages to be included in the response for descriptions. Null means all
   // available languages.
-  repeated cmp.types.v1alpha.Language languages = 3;
+  repeated cmp.types.v1.Language languages = 3;
 
   // Activity codes
-  repeated cmp.types.v1alpha.SupplierProductCode supplier_codes = 4;
+  repeated cmp.types.v1.SupplierProductCode supplier_codes = 4;
 }
 
 message ActivityProductInfoResponse {
   // Message header
-  cmp.types.v1alpha.ResponseHeader header = 1;
+  cmp.types.v1.ResponseHeader header = 1;
 
   // Product list: Activities
   repeated ActivityExtendedInfo activities = 2;
@@ -34,8 +34,8 @@ message ActivityProductInfoResponse {
 
 // Activity product info service definition
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1alpha/info.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1alpha/info.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1/info.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1/info.proto.dot.svg)
 service ActivityProductInfoService {
   // Returns product list for activity
   rpc ActivityProductInfo(ActivityProductInfoRequest) returns (ActivityProductInfoResponse);
diff --git a/proto/cmp/services/activity/v1alpha/list.proto b/proto/cmp/services/activity/v1/list.proto
similarity index 67%
rename from proto/cmp/services/activity/v1alpha/list.proto
rename to proto/cmp/services/activity/v1/list.proto
index 8d92f472..d3c50566 100644
--- a/proto/cmp/services/activity/v1alpha/list.proto
+++ b/proto/cmp/services/activity/v1/list.proto
@@ -1,14 +1,14 @@
 syntax = "proto3";
 
-package cmp.services.activity.v1alpha;
+package cmp.services.activity.v1;
 
-import "cmp/services/activity/v1alpha/activity_types.proto";
-import "cmp/types/v1alpha/common.proto";
+import "cmp/services/activity/v1/activity_types.proto";
+import "cmp/types/v1/common.proto";
 import "google/protobuf/timestamp.proto";
 
 message ActivityProductListRequest {
   // Message header
-  cmp.types.v1alpha.RequestHeader header = 1;
+  cmp.types.v1.RequestHeader header = 1;
 
   // Only respond with the products that are modified after this timestamp
   google.protobuf.Timestamp modified_after = 2;
@@ -16,7 +16,7 @@ message ActivityProductListRequest {
 
 message ActivityProductListResponse {
   // Message header
-  cmp.types.v1alpha.ResponseHeader header = 1;
+  cmp.types.v1.ResponseHeader header = 1;
 
   // Product list: Activities
   repeated Activity activities = 2;
@@ -24,8 +24,8 @@ message ActivityProductListResponse {
 
 // This service is used to get a product list for activities.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1alpha/list.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1alpha/list.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1/list.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1/list.proto.dot.svg)
 service ActivityProductListService {
   // Gets an optional `modified_after` date and returns a product list.
   rpc ActivityProductList(ActivityProductListRequest) returns (ActivityProductListResponse);
diff --git a/proto/cmp/services/activity/v1alpha/search.proto b/proto/cmp/services/activity/v1/search.proto
similarity index 78%
rename from proto/cmp/services/activity/v1alpha/search.proto
rename to proto/cmp/services/activity/v1/search.proto
index ad1b89f1..f2fefd43 100644
--- a/proto/cmp/services/activity/v1alpha/search.proto
+++ b/proto/cmp/services/activity/v1/search.proto
@@ -35,30 +35,30 @@ syntax = "proto3";
 //
 // The Activity search messages will be adapted to work with the SeatMap services,
 // just like the Transport service. This package is **WIP**.
-package cmp.services.activity.v1alpha;
+package cmp.services.activity.v1;
 
-import "cmp/services/activity/v1alpha/search_parameters_types.proto";
-import "cmp/services/activity/v1alpha/search_result_types.proto";
-import "cmp/types/v1alpha/common.proto";
-import "cmp/types/v1alpha/location.proto";
-import "cmp/types/v1alpha/search.proto";
-import "cmp/types/v1alpha/travel_period.proto";
-import "cmp/types/v1alpha/traveller.proto";
+import "cmp/services/activity/v1/search_parameters_types.proto";
+import "cmp/services/activity/v1/search_result_types.proto";
+import "cmp/types/v1/common.proto";
+import "cmp/types/v1/location.proto";
+import "cmp/types/v1/search.proto";
+import "cmp/types/v1/travel_period.proto";
+import "cmp/types/v1/traveller.proto";
 
 // Search request for Activities
 message ActivitySearchRequest {
   // Message header. Contains API version, message info string and end-user wallet
   // address.
-  cmp.types.v1alpha.RequestHeader header = 1;
+  cmp.types.v1.RequestHeader header = 1;
 
   // Search request metadata
-  cmp.types.v1alpha.SearchRequestMetadata metadata = 2;
+  cmp.types.v1.SearchRequestMetadata metadata = 2;
 
   // Generic search parameters
   //
   // Ex: Inclusion of OnRequest options, inclusion of only the cheapest or all
   // options, setting the market, language, currency, sorting and filters etc.
-  cmp.types.v1alpha.SearchParameters search_parameters_generic = 3;
+  cmp.types.v1.SearchParameters search_parameters_generic = 3;
 
   // Activity specific search parameters
   //
@@ -67,10 +67,10 @@ message ActivitySearchRequest {
   ActivitySearchParameters search_parameters_activity = 4;
 
   // Travel period
-  cmp.types.v1alpha.TravelPeriod travel_period = 5;
+  cmp.types.v1.TravelPeriod travel_period = 5;
 
   // Travellers
-  repeated cmp.types.v1alpha.BasicTraveller travellers = 6;
+  repeated cmp.types.v1.BasicTraveller travellers = 6;
 
   // For search, set only one of the fields at once. Source location indicates the
   // customer’s position at the start of the service. Typical value would be the
@@ -85,19 +85,19 @@ message ActivitySearchRequest {
   oneof source_location {
     // The code and code type of a stay location the provider will be able to process
     // Ex. GiataID
-    cmp.types.v1alpha.LocationCodes source_location_codes = 7;
+    cmp.types.v1.LocationCodes source_location_codes = 7;
 
     // Single geographic point represented by two double fields.
-    cmp.types.v1alpha.Coordinates source_location_coordinates = 8;
+    cmp.types.v1.Coordinates source_location_coordinates = 8;
 
     // Geo tree type, represented by Country, Region, and City_or_Resort.
-    cmp.types.v1alpha.GeoTree source_location_geo_tree = 9;
+    cmp.types.v1.GeoTree source_location_geo_tree = 9;
 
     // Geo circle. Represented by a coordinate and a distance for radius
-    cmp.types.v1alpha.GeoCircle source_location_geo_circle = 10;
+    cmp.types.v1.GeoCircle source_location_geo_circle = 10;
 
     // Geo polygon. Represented by a list of coordinate points.
-    cmp.types.v1alpha.GeoPolygon source_location_geo_polygon = 11;
+    cmp.types.v1.GeoPolygon source_location_geo_polygon = 11;
   }
 
   // For search, set only one of the field at once. Service location specifies the
@@ -110,32 +110,32 @@ message ActivitySearchRequest {
     // The code and code type of a stay location the distributor will be able to
     // process. Ex. Google Place ID, Foursquare fsq_id, OpenStreetMap Ref, Here ID or
     // any other agreed code type.
-    cmp.types.v1alpha.LocationCodes service_location_codes = 12;
+    cmp.types.v1.LocationCodes service_location_codes = 12;
 
     // Single geographic point represented by two double fields.
-    cmp.types.v1alpha.Coordinates service_location_coordinates = 13;
+    cmp.types.v1.Coordinates service_location_coordinates = 13;
 
     // Geo tree type, represented by Country, Region, and City_or_Resort.
-    cmp.types.v1alpha.GeoTree service_location_geo_tree = 14;
+    cmp.types.v1.GeoTree service_location_geo_tree = 14;
 
     // Geo circle. Represented by a coordinate and a distance for radius
-    cmp.types.v1alpha.GeoCircle service_location_geo_circle = 15;
+    cmp.types.v1.GeoCircle service_location_geo_circle = 15;
 
     // Geo polygon. Represented by a list of coordinate points.
-    cmp.types.v1alpha.GeoPolygon service_location_geo_polygon = 16;
+    cmp.types.v1.GeoPolygon service_location_geo_polygon = 16;
   }
 }
 
 message ActivitySearchResponse {
   // Message header. Contains API version, message info string and end user wallet
   // address.
-  cmp.types.v1alpha.ResponseHeader header = 1;
+  cmp.types.v1.ResponseHeader header = 1;
 
   // Search response metadata
   //
   // The most important field is the search_id, which is a UUID that needs to be
   // carried through to the validate request.
-  cmp.types.v1alpha.SearchResponseMetadata metadata = 2;
+  cmp.types.v1.SearchResponseMetadata metadata = 2;
 
   // Unique combinations of bookable search results, each identified by a result_id
   // that needs to be carried through to the validate request.
@@ -144,15 +144,15 @@ message ActivitySearchResponse {
   // The traveller_id is specified in each result and the ids are detailed with
   // basic traveller data only once in the top-level search response to avoid
   // repetition.
-  repeated cmp.types.v1alpha.BasicTraveller travellers = 4;
+  repeated cmp.types.v1.BasicTraveller travellers = 4;
 }
 
 // Activity Search Service
 //
 // Takes `ActivitySearchRequest` message type and returns `ActivitySearchResponse` message type.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1alpha/search.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1alpha/search.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1/search.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1/search.proto.dot.svg)
 service ActivitySearchService {
   rpc ActivitySearch(ActivitySearchRequest) returns (ActivitySearchResponse);
 }
diff --git a/proto/cmp/services/activity/v1alpha/search_parameters_types.proto b/proto/cmp/services/activity/v1/search_parameters_types.proto
similarity index 69%
rename from proto/cmp/services/activity/v1alpha/search_parameters_types.proto
rename to proto/cmp/services/activity/v1/search_parameters_types.proto
index 9f25bf12..8a920e1a 100644
--- a/proto/cmp/services/activity/v1alpha/search_parameters_types.proto
+++ b/proto/cmp/services/activity/v1/search_parameters_types.proto
@@ -1,30 +1,30 @@
 syntax = "proto3";
 
-package cmp.services.activity.v1alpha;
+package cmp.services.activity.v1;
 
-import "cmp/types/v1alpha/duration.proto";
-import "cmp/types/v1alpha/language.proto";
-import "cmp/types/v1alpha/price.proto";
-import "cmp/types/v1alpha/product_code.proto";
+import "cmp/types/v1/duration.proto";
+import "cmp/types/v1/language.proto";
+import "cmp/types/v1/price.proto";
+import "cmp/types/v1/product_code.proto";
 
 // These are Activity specific search parameters
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1alpha/search_parameters_types.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1alpha/search_parameters_types.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1/search_parameters_types.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1/search_parameters_types.proto.dot.svg)
 message ActivitySearchParameters {
   // Specify the language(s) a potential guide should speak for example a tour in
   // the Anne Frank house in Amsterdam in French or the tour at the pyramids in
   // Egypt should be in Russian
-  repeated cmp.types.v1alpha.Language spoken_languages = 1;
+  repeated cmp.types.v1.Language spoken_languages = 1;
 
   // Specify one or more supplier codes to be included in the search response
   // These must match the supplier codes provided in the ProductList and
   // ProductInfo messages
-  repeated cmp.types.v1alpha.SupplierProductCode supplier_codes = 2;
+  repeated cmp.types.v1.SupplierProductCode supplier_codes = 2;
 
   // Specify one or more product codes to be included in the search response
   // These can be of different types
-  repeated cmp.types.v1alpha.ProductCode product_codes = 3;
+  repeated cmp.types.v1.ProductCode product_codes = 3;
 
   // Specify one or more unit IDs to be included in the search response
   // The purpose of this concept is to allow for different activities for one product
@@ -43,13 +43,13 @@ message ActivitySearchParameters {
   //
   // Specify the minimal and maximum duration of an activity to be included in the
   // search response
-  cmp.types.v1alpha.Duration min_duration = 6;
-  cmp.types.v1alpha.Duration max_duration = 7;
+  cmp.types.v1.Duration min_duration = 6;
+  cmp.types.v1.Duration max_duration = 7;
 
   // Price range
   //
   // Specify the minimum and maximum price of an activity to be included in the
   // search response
-  cmp.types.v1alpha.Price min_price = 8;
-  cmp.types.v1alpha.Price max_price = 9;
+  cmp.types.v1.Price min_price = 8;
+  cmp.types.v1.Price max_price = 9;
 }
diff --git a/proto/cmp/services/activity/v1alpha/search_result_types.proto b/proto/cmp/services/activity/v1/search_result_types.proto
similarity index 60%
rename from proto/cmp/services/activity/v1alpha/search_result_types.proto
rename to proto/cmp/services/activity/v1/search_result_types.proto
index fe4569bd..688f557f 100644
--- a/proto/cmp/services/activity/v1alpha/search_result_types.proto
+++ b/proto/cmp/services/activity/v1/search_result_types.proto
@@ -1,17 +1,17 @@
 syntax = "proto3";
 
-package cmp.services.activity.v1alpha;
+package cmp.services.activity.v1;
 
-import "cmp/services/activity/v1alpha/activity_types.proto";
-import "cmp/types/v1alpha/datetime_range.proto";
-import "cmp/types/v1alpha/price.proto";
-import "cmp/types/v1alpha/price_type.proto";
+import "cmp/services/activity/v1/activity_types.proto";
+import "cmp/types/v1/datetime_range.proto";
+import "cmp/types/v1/price.proto";
+import "cmp/types/v1/price_type.proto";
 
 // This type represents a search result and is used in the `ActivitySearchResponse`
 // message.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1alpha/search_result_types.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1alpha/search_result_types.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1/search_result_types.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/activity/v1/search_result_types.proto.dot.svg)
 message ActivitySearchResult {
   // Option ID for the search option. This is an increasing number starting at 0 and
   // increasing by 1 for every search result.
@@ -21,7 +21,7 @@ message ActivitySearchResult {
   Activity info = 2;
 
   // Schedule
-  cmp.types.v1alpha.DateTimeRange schedule = 3;
+  cmp.types.v1.DateTimeRange schedule = 3;
 
   // Activity location
   ActivityLocation location = 4;
@@ -36,9 +36,9 @@ message ActivitySearchResult {
   int32 max_participants = 7;
 
   // Price with value and currency code
-  cmp.types.v1alpha.Price price = 8;
+  cmp.types.v1.Price price = 8;
 
   // Pricing type
   // Ex: "PerPerson", "PerGroup"
-  cmp.types.v1alpha.ChargeType charge_type = 9;
+  cmp.types.v1.ChargeType charge_type = 9;
 }
diff --git a/proto/cmp/services/book/v1alpha/mint.proto b/proto/cmp/services/book/v1/mint.proto
similarity index 66%
rename from proto/cmp/services/book/v1alpha/mint.proto
rename to proto/cmp/services/book/v1/mint.proto
index ff8fa5b6..8aa54cbc 100644
--- a/proto/cmp/services/book/v1alpha/mint.proto
+++ b/proto/cmp/services/book/v1/mint.proto
@@ -1,33 +1,33 @@
 syntax = "proto3";
 
-package cmp.services.book.v1alpha;
-
-import "cmp/types/v1alpha/common.proto";
-import "cmp/types/v1alpha/language.proto";
-import "cmp/types/v1alpha/payment.proto";
-import "cmp/types/v1alpha/price.proto";
-import "cmp/types/v1alpha/pubkey.proto";
-import "cmp/types/v1alpha/token.proto";
-import "cmp/types/v1alpha/traveller.proto";
-import "cmp/types/v1alpha/uuid.proto";
+package cmp.services.book.v1;
+
+import "cmp/types/v1/common.proto";
+import "cmp/types/v1/language.proto";
+import "cmp/types/v1/payment.proto";
+import "cmp/types/v1/price.proto";
+import "cmp/types/v1/pubkey.proto";
+import "cmp/types/v1/token.proto";
+import "cmp/types/v1/traveller.proto";
+import "cmp/types/v1/uuid.proto";
 import "google/protobuf/timestamp.proto";
 
 message MintRequest {
   // Message header
-  cmp.types.v1alpha.RequestHeader header = 1;
+  cmp.types.v1.RequestHeader header = 1;
 
   // This must be a UUID according to RFC 4122
-  cmp.types.v1alpha.UUID validation_id = 2;
+  cmp.types.v1.UUID validation_id = 2;
 
   string external_session_id = 3;
 
-  cmp.types.v1alpha.Language language = 4;
+  cmp.types.v1.Language language = 4;
 
   string market = 5;
 
   string booking_reference = 6;
 
-  repeated cmp.types.v1alpha.ExtensiveTraveller travellers = 7;
+  repeated cmp.types.v1.ExtensiveTraveller travellers = 7;
 
   // The comments field is meant to pass noncommittal remarks entered by the
   // end-consumer about the service reservation,  like "non-smoking room please",
@@ -35,25 +35,25 @@ message MintRequest {
   string comment = 8;
 
   // Public keys that will be used to encrypt the private booking data
-  repeated cmp.types.v1alpha.PublicKey public_keys = 9;
+  repeated cmp.types.v1.PublicKey public_keys = 9;
 
   // Buyer's address. Only this address should be allowed to buy the `BookingToken`
   // on chain.
   string buyer_address = 10;
 
   // This field is only relevant for off chain virtual credit card payments.
-  cmp.types.v1alpha.AdditionalPaymentInfo additional_payment_info = 11;
+  cmp.types.v1.AdditionalPaymentInfo additional_payment_info = 11;
 }
 
 message MintResponse {
   // Message header
-  cmp.types.v1alpha.ResponseHeader header = 1;
+  cmp.types.v1.ResponseHeader header = 1;
 
   // This must be a UUID according to RFC 4122
-  cmp.types.v1alpha.UUID mint_id = 2;
+  cmp.types.v1.UUID mint_id = 2;
 
   // This must be a UUID according to RFC 4122
-  cmp.types.v1alpha.UUID validation_id = 3;
+  cmp.types.v1.UUID validation_id = 3;
 
   string provider_booking_reference = 4;
 
@@ -62,10 +62,10 @@ message MintResponse {
 
   // Price of the `BookingToken`. This field is meant to be populated by the
   // supplier plugin and used by the supplier bot while minting the `BookingToken`.
-  cmp.types.v1alpha.Price price = 6;
+  cmp.types.v1.Price price = 6;
 
   // The token that represents the booking of the service
-  cmp.types.v1alpha.BookingToken booking_token = 7;
+  cmp.types.v1.BookingToken booking_token = 7;
 
   // Mint transaction ID that will be populated by the supplier bot after the
   // `BookingToken` is minted on chain.
@@ -83,8 +83,8 @@ message MintResponse {
   string buy_transaction_id = 10;
 }
 
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/book/v1alpha/mint.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/book/v1alpha/mint.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/book/v1/mint.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/book/v1/mint.proto.dot.svg)
 service MintService {
   rpc Mint(MintRequest) returns (MintResponse);
 }
diff --git a/proto/cmp/services/book/v1alpha/validate.proto b/proto/cmp/services/book/v1/validate.proto
similarity index 62%
rename from proto/cmp/services/book/v1alpha/validate.proto
rename to proto/cmp/services/book/v1/validate.proto
index 9f2e625a..8bbff8ac 100644
--- a/proto/cmp/services/book/v1alpha/validate.proto
+++ b/proto/cmp/services/book/v1/validate.proto
@@ -1,16 +1,16 @@
 syntax = "proto3";
 
-package cmp.services.book.v1alpha;
+package cmp.services.book.v1;
 
-import "cmp/types/v1alpha/common.proto";
-import "cmp/types/v1alpha/price.proto";
-import "cmp/types/v1alpha/search.proto";
-import "cmp/types/v1alpha/seat_map.proto";
-import "cmp/types/v1alpha/uuid.proto";
+import "cmp/types/v1/common.proto";
+import "cmp/types/v1/price.proto";
+import "cmp/types/v1/search.proto";
+import "cmp/types/v1/seat_map.proto";
+import "cmp/types/v1/uuid.proto";
 
 message ValidationRequest {
   // Message header
-  cmp.types.v1alpha.RequestHeader header = 1;
+  cmp.types.v1.RequestHeader header = 1;
 
   // Validation object
   ValidationObject validation_object = 2;
@@ -18,16 +18,16 @@ message ValidationRequest {
 
 message ValidationResponse {
   // Message header
-  cmp.types.v1alpha.ResponseHeader header = 1;
+  cmp.types.v1.ResponseHeader header = 1;
 
   // Unique validation ID. This must be a UUID according to RFC 4122
-  cmp.types.v1alpha.UUID validation_id = 2;
+  cmp.types.v1.UUID validation_id = 2;
 
   // Validation object
   ValidationObject validation_object = 3;
 
   // Price details for the validated product
-  cmp.types.v1alpha.PriceDetail price_detail = 4;
+  cmp.types.v1.PriceDetail price_detail = 4;
 }
 
 // Validation message that represents a single `result_id` from the search results
@@ -35,18 +35,18 @@ message ValidationResponse {
 // requires it. For example a seat for a concert.
 message ValidationObject {
   // Search result identifier with `search_id` & `result_id`
-  cmp.types.v1alpha.SearchIdentifier search_identifier = 1;
+  cmp.types.v1.SearchIdentifier search_identifier = 1;
 
   // Unit identifier that is used to describe selected units from the `result_id`.
   // For example: seats for a concert.
   oneof unit_identifier {
     // Selected seat(s) represented as a seat map inventory message type.
-    cmp.types.v1alpha.SeatMapInventory seat_selection = 2;
+    cmp.types.v1.SeatMapInventory seat_selection = 2;
   }
 }
 
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/book/v1alpha/validate.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/book/v1alpha/validate.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/book/v1/validate.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/book/v1/validate.proto.dot.svg)
 service ValidationService {
   rpc Validation(ValidationRequest) returns (ValidationResponse);
 }
diff --git a/proto/cmp/services/info/v1alpha/entry_requirements.proto b/proto/cmp/services/info/v1/entry_requirements.proto
similarity index 62%
rename from proto/cmp/services/info/v1alpha/entry_requirements.proto
rename to proto/cmp/services/info/v1/entry_requirements.proto
index 98d910bd..62a64fa8 100644
--- a/proto/cmp/services/info/v1alpha/entry_requirements.proto
+++ b/proto/cmp/services/info/v1/entry_requirements.proto
@@ -1,64 +1,64 @@
 syntax = "proto3";
 
-package cmp.services.info.v1alpha;
-
-import "cmp/types/v1alpha/common.proto";
-import "cmp/types/v1alpha/country.proto";
-import "cmp/types/v1alpha/datetime_range.proto";
-import "cmp/types/v1alpha/filter.proto";
-import "cmp/types/v1alpha/language.proto";
-import "cmp/types/v1alpha/localized.proto";
-import "cmp/types/v1alpha/travel_type.proto";
-import "cmp/types/v1alpha/uuid.proto";
+package cmp.services.info.v1;
+
+import "cmp/types/v1/common.proto";
+import "cmp/types/v1/country.proto";
+import "cmp/types/v1/datetime_range.proto";
+import "cmp/types/v1/filter.proto";
+import "cmp/types/v1/language.proto";
+import "cmp/types/v1/localized.proto";
+import "cmp/types/v1/travel_type.proto";
+import "cmp/types/v1/uuid.proto";
 import "google/protobuf/timestamp.proto";
 
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/info/v1alpha/entry_requirements.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/info/v1alpha/entry_requirements.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/info/v1/entry_requirements.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/info/v1/entry_requirements.proto.dot.svg)
 service CountryEntryRequirementsService {
   rpc CountryEntryRequirements(CountryEntryRequirementsRequest) returns (CountryEntryRequirementsResponse);
 }
 
 message CountryEntryRequirementsRequest {
   // Message header
-  cmp.types.v1alpha.RequestHeader header = 1;
+  cmp.types.v1.RequestHeader header = 1;
 
   // Departure country
-  cmp.types.v1alpha.Country departure = 2;
+  cmp.types.v1.Country departure = 2;
 
   // Destination country
-  cmp.types.v1alpha.Country destination = 3;
+  cmp.types.v1.Country destination = 3;
 
   // Citizenship
-  cmp.types.v1alpha.Country citizenship = 4;
+  cmp.types.v1.Country citizenship = 4;
 
   // Residence
-  cmp.types.v1alpha.Country residence = 5;
+  cmp.types.v1.Country residence = 5;
 
   // Transit country
-  cmp.types.v1alpha.Country transit = 6;
+  cmp.types.v1.Country transit = 6;
 
   // Travel type, ex: business or tourism
-  cmp.types.v1alpha.TravelType travel_type = 7;
+  cmp.types.v1.TravelType travel_type = 7;
 
   // Date time range, start and end dates of visit, as timestamp.
-  cmp.types.v1alpha.DateTimeRange datetime_range = 8;
+  cmp.types.v1.DateTimeRange datetime_range = 8;
 
   // Languages requested
-  repeated cmp.types.v1alpha.Language languages = 9;
+  repeated cmp.types.v1.Language languages = 9;
 
   bool exclude_categories = 10;
 
   bool include_items = 11;
 
-  repeated cmp.types.v1alpha.Filter filters = 12;
+  repeated cmp.types.v1.Filter filters = 12;
 }
 
 message CountryEntryRequirementsResponse {
   // Message header
-  cmp.types.v1alpha.ResponseHeader header = 1;
+  cmp.types.v1.ResponseHeader header = 1;
 
   // This must be a UUID according to RFC 4122
-  cmp.types.v1alpha.UUID response_id = 2;
+  cmp.types.v1.UUID response_id = 2;
 
   // Categories
   repeated CountryEntryRequirementCategory categories = 3;
@@ -74,7 +74,7 @@ message CountryEntryRequirementCategory {
   string key = 1;
 
   // List of localized names
-  repeated cmp.types.v1alpha.LocalizedString names = 2;
+  repeated cmp.types.v1.LocalizedString names = 2;
 
   // Items
   repeated CountryEntryRequirementItem items = 3;
@@ -100,7 +100,7 @@ message CountryEntryRequirementItem {
 message LocalizedItemInfo {
   string name = 1;
   string description = 2;
-  cmp.types.v1alpha.Language language = 3;
+  cmp.types.v1.Language language = 3;
 }
 
 // FIXME: We need to clarify what true, false and undefined means for status and
diff --git a/proto/cmp/services/network/v1alpha/fee.proto b/proto/cmp/services/network/v1/fee.proto
similarity index 80%
rename from proto/cmp/services/network/v1alpha/fee.proto
rename to proto/cmp/services/network/v1/fee.proto
index c5d3f6fb..10115315 100644
--- a/proto/cmp/services/network/v1alpha/fee.proto
+++ b/proto/cmp/services/network/v1/fee.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.services.network.v1alpha;
+package cmp.services.network.v1;
 
 // Network Fee Message Type
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/network/v1alpha/fee.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/network/v1alpha/fee.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/network/v1/fee.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/network/v1/fee.proto.dot.svg)
 message NetworkFee {
   // Network fee, unit is nCAM
   // 1 CAM == 1 000 000 000 nCAM
diff --git a/proto/cmp/services/partner/v1alpha/partner_configuration.proto b/proto/cmp/services/partner/v1/partner_configuration.proto
similarity index 83%
rename from proto/cmp/services/partner/v1alpha/partner_configuration.proto
rename to proto/cmp/services/partner/v1/partner_configuration.proto
index 7a5c0e39..fbc8c0f9 100644
--- a/proto/cmp/services/partner/v1alpha/partner_configuration.proto
+++ b/proto/cmp/services/partner/v1/partner_configuration.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-package cmp.services.partner.v1alpha;
+package cmp.services.partner.v1;
 
-import "cmp/types/v1alpha/partner.proto";
+import "cmp/types/v1/partner.proto";
 
 // Partner Configuration message type
 //
@@ -10,7 +10,7 @@ import "cmp/types/v1alpha/partner.proto";
 // implemented yet)
 message PartnerConfiguration {
   // List of partners from the on-chain Partner Configuration
-  repeated cmp.types.v1alpha.Partner partners = 1;
+  repeated cmp.types.v1.Partner partners = 1;
 }
 
 message GetPartnerConfigurationRequest {
@@ -32,8 +32,8 @@ message GetPartnerConfigurationResponse {
 
 // Get Partner Configuration Service
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/partner/v1alpha/partner_configuration.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/partner/v1alpha/partner_configuration.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/partner/v1/partner_configuration.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/partner/v1/partner_configuration.proto.dot.svg)
 service GetPartnerConfigurationService {
   // #### GetPartnerConfiguration
   //
diff --git a/proto/cmp/services/ping/v1alpha/ping.proto b/proto/cmp/services/ping/v1/ping.proto
similarity index 74%
rename from proto/cmp/services/ping/v1alpha/ping.proto
rename to proto/cmp/services/ping/v1/ping.proto
index 6e145a7d..4d2e402c 100644
--- a/proto/cmp/services/ping/v1alpha/ping.proto
+++ b/proto/cmp/services/ping/v1/ping.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
 
 // ### Ping Message
-package cmp.services.ping.v1alpha;
+package cmp.services.ping.v1;
 
-import "cmp/types/v1alpha/common.proto";
+import "cmp/types/v1/common.proto";
 import "google/protobuf/timestamp.proto";
 
 // The ping message is designed to test the availability of a provider service and
@@ -11,7 +11,7 @@ import "google/protobuf/timestamp.proto";
 // stored of each hop.
 message PingRequest {
   // Message Header
-  cmp.types.v1alpha.RequestHeader header = 1;
+  cmp.types.v1.RequestHeader header = 1;
 
   // Ping message
   string ping_message = 2;
@@ -22,7 +22,7 @@ message PingRequest {
 
 message PingResponse {
   // Message Header
-  cmp.types.v1alpha.ResponseHeader header = 1;
+  cmp.types.v1.ResponseHeader header = 1;
 
   // Ping message
   string ping_message = 2;
@@ -33,8 +33,8 @@ message PingResponse {
 
 // The Ping Service definition
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/ping/v1alpha/ping.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/ping/v1alpha/ping.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/ping/v1/ping.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/ping/v1/ping.proto.dot.svg)
 service PingService {
   // Ping Method
   rpc Ping(PingRequest) returns (PingResponse);
diff --git a/proto/cmp/services/seat_map/v1alpha/availability.proto b/proto/cmp/services/seat_map/v1/availability.proto
similarity index 74%
rename from proto/cmp/services/seat_map/v1alpha/availability.proto
rename to proto/cmp/services/seat_map/v1/availability.proto
index 85c87e99..6cc48416 100644
--- a/proto/cmp/services/seat_map/v1alpha/availability.proto
+++ b/proto/cmp/services/seat_map/v1/availability.proto
@@ -1,10 +1,10 @@
 syntax = "proto3";
 
-package cmp.services.seat_map.v1alpha;
+package cmp.services.seat_map.v1;
 
-import "cmp/types/v1alpha/common.proto";
-import "cmp/types/v1alpha/search.proto";
-import "cmp/types/v1alpha/seat_map.proto";
+import "cmp/types/v1/common.proto";
+import "cmp/types/v1/search.proto";
+import "cmp/types/v1/seat_map.proto";
 
 // Request for seat map availability data
 //
@@ -13,7 +13,7 @@ message SeatMapAvailabilityRequest {
   // Message header
   //
   // Header contains information about the request
-  cmp.types.v1alpha.RequestHeader header = 1;
+  cmp.types.v1.RequestHeader header = 1;
 
   // Required. The identifier of the seat map.
   oneof identifier {
@@ -28,7 +28,7 @@ message SeatMapAvailabilityRequest {
     //
     // Example: For requesting seat availability for search results. In this case,
     // booking has not happended yet.
-    cmp.types.v1alpha.SearchIdentifier search_identifier = 3;
+    cmp.types.v1.SearchIdentifier search_identifier = 3;
   }
 }
 
@@ -39,18 +39,18 @@ message SeatMapAvailabilityResponse {
   // Message header
   //
   // Header contains information about the response
-  cmp.types.v1alpha.ResponseHeader header = 1;
+  cmp.types.v1.ResponseHeader header = 1;
 
   // Required. Seat map availability data.
-  cmp.types.v1alpha.SeatMapInventory seat_map = 2;
+  cmp.types.v1.SeatMapInventory seat_map = 2;
 }
 
 // Service for requesting seat map availability data
 //
 // Service is used to request the seat map availability data for a given map ID
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/seat_map/v1alpha/availability.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/seat_map/v1alpha/availability.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/seat_map/v1/availability.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/seat_map/v1/availability.proto.dot.svg)
 service SeatMapAvailabilityService {
   // Get seat map availability data
   //
diff --git a/proto/cmp/services/seat_map/v1alpha/seat_map.proto b/proto/cmp/services/seat_map/v1/seat_map.proto
similarity index 67%
rename from proto/cmp/services/seat_map/v1alpha/seat_map.proto
rename to proto/cmp/services/seat_map/v1/seat_map.proto
index cbdf8808..14c06113 100644
--- a/proto/cmp/services/seat_map/v1alpha/seat_map.proto
+++ b/proto/cmp/services/seat_map/v1/seat_map.proto
@@ -1,10 +1,10 @@
 syntax = "proto3";
 
-package cmp.services.seat_map.v1alpha;
+package cmp.services.seat_map.v1;
 
-import "cmp/types/v1alpha/common.proto";
-import "cmp/types/v1alpha/language.proto";
-import "cmp/types/v1alpha/seat_map.proto";
+import "cmp/types/v1/common.proto";
+import "cmp/types/v1/language.proto";
+import "cmp/types/v1/seat_map.proto";
 
 // Request for seat map data
 //
@@ -13,7 +13,7 @@ message SeatMapRequest {
   // Request header
   //
   // Header contains information about the request
-  cmp.types.v1alpha.RequestHeader header = 1;
+  cmp.types.v1.RequestHeader header = 1;
 
   // Unique identifier for the seat map
   //
@@ -22,7 +22,7 @@ message SeatMapRequest {
   string map_id = 2;
 
   // Requested Languages
-  repeated cmp.types.v1alpha.Language languages = 3;
+  repeated cmp.types.v1.Language languages = 3;
 }
 
 // Response for seat map request
@@ -32,18 +32,18 @@ message SeatMapResponse {
   // Response header
   //
   // Header contains information about the response
-  cmp.types.v1alpha.ResponseHeader header = 1;
+  cmp.types.v1.ResponseHeader header = 1;
 
   // Seat map data
   //
   // Contains the seat map data for the requested map ID
-  cmp.types.v1alpha.SeatMap seat_map = 2;
+  cmp.types.v1.SeatMap seat_map = 2;
 }
 
 // Service for requesting seat map data for a given map ID
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/seat_map/v1alpha/seat_map.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/seat_map/v1alpha/seat_map.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/seat_map/v1/seat_map.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/seat_map/v1/seat_map.proto.dot.svg)
 service SeatMapService {
   // Get seat map data
   //
diff --git a/proto/cmp/services/transport/v1alpha/search.proto b/proto/cmp/services/transport/v1/search.proto
similarity index 66%
rename from proto/cmp/services/transport/v1alpha/search.proto
rename to proto/cmp/services/transport/v1/search.proto
index cfc23015..d6807ff9 100644
--- a/proto/cmp/services/transport/v1alpha/search.proto
+++ b/proto/cmp/services/transport/v1/search.proto
@@ -9,29 +9,29 @@ syntax = "proto3";
 // and Product Details messages.
 //
 // This package is a WIP.
-package cmp.services.transport.v1alpha;
+package cmp.services.transport.v1;
 
-import "cmp/services/transport/v1alpha/search_query_types.proto";
-import "cmp/services/transport/v1alpha/search_result_types.proto";
-import "cmp/types/v1alpha/common.proto";
-import "cmp/types/v1alpha/content_source.proto";
-import "cmp/types/v1alpha/search.proto";
-import "cmp/types/v1alpha/traveller.proto";
+import "cmp/services/transport/v1/search_query_types.proto";
+import "cmp/services/transport/v1/search_result_types.proto";
+import "cmp/types/v1/common.proto";
+import "cmp/types/v1/content_source.proto";
+import "cmp/types/v1/search.proto";
+import "cmp/types/v1/traveller.proto";
 
 // Transport Search Request
 message TransportSearchRequest {
   // Message header. Contains API version, message info string and end-user wallet
   // address
-  cmp.types.v1alpha.RequestHeader header = 1;
+  cmp.types.v1.RequestHeader header = 1;
 
   // Search request metadata
-  cmp.types.v1alpha.SearchRequestMetadata metadata = 2;
+  cmp.types.v1.SearchRequestMetadata metadata = 2;
 
   // Generic search parameters
   //
   // Ex: Inclusion of OnRequest options and inclusion of only the cheapest or all
   // options.
-  cmp.types.v1alpha.SearchParameters search_parameters = 3;
+  cmp.types.v1.SearchParameters search_parameters = 3;
 
   // Multiple search queries for this search request
   repeated TransportSearchQuery queries = 4;
@@ -43,23 +43,23 @@ message TransportSearchRequest {
 message TransportSearchResponse {
   // Message header. Contains API version, message info string and end-user wallet
   // address
-  cmp.types.v1alpha.ResponseHeader header = 1;
+  cmp.types.v1.ResponseHeader header = 1;
 
   // Search response metadata
-  cmp.types.v1alpha.SearchResponseMetadata metadata = 2;
+  cmp.types.v1.SearchResponseMetadata metadata = 2;
 
   // Conten source types for this search request.
   //
   // Ex: ContentSourceType.CONTENT_SOURCE_TYPE_GDS,
   // ContentSourceType.CONTENT_SOURCE_TYPE_NDC
   // ContentSourceType.CONTENT_SOURCE_TYPE_3RD_PARTY
-  repeated cmp.types.v1alpha.ContentSourceType conten_source_types = 3;
+  repeated cmp.types.v1.ContentSourceType conten_source_types = 3;
 
   // Transit search results
   repeated TransportSearchResult results = 4;
 
   // Global definition of the travellers for all results to be used via the traveller_id
-  repeated cmp.types.v1alpha.BasicTraveller travellers = 5;
+  repeated cmp.types.v1.BasicTraveller travellers = 5;
 }
 
 // Transport Search Service definition.
@@ -67,8 +67,8 @@ message TransportSearchResponse {
 // Takes `TransportSearchRequest` message type and returns `TransportSearchResponse`
 // message type.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1alpha/search.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1alpha/search.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1/search.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1/search.proto.dot.svg)
 service TransportSearchService {
   rpc TransportSearch(TransportSearchRequest) returns (TransportSearchResponse);
 }
diff --git a/proto/cmp/services/transport/v1alpha/search_parameters_types.proto b/proto/cmp/services/transport/v1/search_parameters_types.proto
similarity index 59%
rename from proto/cmp/services/transport/v1alpha/search_parameters_types.proto
rename to proto/cmp/services/transport/v1/search_parameters_types.proto
index 3519a80e..5e0100f5 100644
--- a/proto/cmp/services/transport/v1alpha/search_parameters_types.proto
+++ b/proto/cmp/services/transport/v1/search_parameters_types.proto
@@ -1,37 +1,37 @@
 syntax = "proto3";
 
-package cmp.services.transport.v1alpha;
+package cmp.services.transport.v1;
 
-import "cmp/types/v1alpha/duration.proto";
-import "cmp/types/v1alpha/price.proto";
-import "cmp/types/v1alpha/product_code.proto";
-import "cmp/types/v1alpha/time.proto";
+import "cmp/types/v1/duration.proto";
+import "cmp/types/v1/price.proto";
+import "cmp/types/v1/product_code.proto";
+import "cmp/types/v1/time.proto";
 
 // Transport Search Parameters
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1alpha/search_parameters_types.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1alpha/search_parameters_types.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1/search_parameters_types.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1/search_parameters_types.proto.dot.svg)
 message TransportSearchParameters {
   // Specify one or more type codes to be included in the search response
   // Ex: code "EW" number "1234" of the type "IATA"
-  repeated cmp.types.v1alpha.ProductCode product_codes = 1;
+  repeated cmp.types.v1.ProductCode product_codes = 1;
 
   // Specify one or more supplier codes to be included in the search response
   // These must match the supplier codes provided in the ProductList and
   // ProductInfo messages
-  repeated cmp.types.v1alpha.SupplierProductCode supplier_code_codes = 2;
+  repeated cmp.types.v1.SupplierProductCode supplier_code_codes = 2;
 
   // The minimum duration of a transport to be included in the search response
-  cmp.types.v1alpha.Duration min_duration = 3;
+  cmp.types.v1.Duration min_duration = 3;
 
   // The maximum duration of a transport to be included in the search response
-  cmp.types.v1alpha.Duration max_duration = 4;
+  cmp.types.v1.Duration max_duration = 4;
 
   // The minimum price of a transport to be included in the search response
-  cmp.types.v1alpha.Price min_price = 5;
+  cmp.types.v1.Price min_price = 5;
 
   // The maximum price of a transport to be included in the search response
-  cmp.types.v1alpha.Price max_price = 6;
+  cmp.types.v1.Price max_price = 6;
 
   // One or more brand codes or distribution channels for which assigned product is
   // to be included in the search response
@@ -43,14 +43,14 @@ message TransportSearchParameters {
   int32 max_segments = 8;
 
   // Minimum departure time of the trip
-  cmp.types.v1alpha.Time trip_min_departure_time = 9;
+  cmp.types.v1.Time trip_min_departure_time = 9;
 
   // Maximum departure time of the trip
-  cmp.types.v1alpha.Time trip_max_departure_time = 10;
+  cmp.types.v1.Time trip_max_departure_time = 10;
 
   // Minimum arrival time of the trip
-  cmp.types.v1alpha.Time trip_min_arrival_time = 11;
+  cmp.types.v1.Time trip_min_arrival_time = 11;
 
   // Maximum arrival time of the trip
-  cmp.types.v1alpha.Time trip_max_arrival_time = 12;
+  cmp.types.v1.Time trip_max_arrival_time = 12;
 }
diff --git a/proto/cmp/services/transport/v1alpha/search_query_types.proto b/proto/cmp/services/transport/v1/search_query_types.proto
similarity index 72%
rename from proto/cmp/services/transport/v1alpha/search_query_types.proto
rename to proto/cmp/services/transport/v1/search_query_types.proto
index c5b4c781..d8f3116a 100644
--- a/proto/cmp/services/transport/v1alpha/search_query_types.proto
+++ b/proto/cmp/services/transport/v1/search_query_types.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.services.transport.v1alpha;
+package cmp.services.transport.v1;
 
-import "cmp/services/transport/v1alpha/search_parameters_types.proto";
-import "cmp/types/v1alpha/date.proto";
-import "cmp/types/v1alpha/location.proto";
-import "cmp/types/v1alpha/traveller.proto";
+import "cmp/services/transport/v1/search_parameters_types.proto";
+import "cmp/types/v1/date.proto";
+import "cmp/types/v1/location.proto";
+import "cmp/types/v1/traveller.proto";
 
 // Transport search query. Multiple trips can be send, each representing multi-leg
 // journey.
@@ -15,15 +15,15 @@ import "cmp/types/v1alpha/traveller.proto";
 // - 2 trips in trips: Roundtrip journey from PMI to BCN and then BCN to PMI.
 // - 3 trips in trips: PMI->BCN + BCN->BER + BER->PMI (1 two legged flight (connection) and 1 direct (return) flight)
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1alpha/search_query_types.proto.dot.xs.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1/search_query_types.proto.dot.xs.svg)
 // [Open Message
-// Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1alpha/search_query_types.proto.dot.svg)
+// Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1/search_query_types.proto.dot.svg)
 message TransportSearchQuery {
   // ID
   int32 query_id = 1;
 
   // Global definition of the travellers for all requests to be used via the traveller_id
-  repeated cmp.types.v1alpha.BasicTraveller travellers = 2;
+  repeated cmp.types.v1.BasicTraveller travellers = 2;
 
   // Trips
   repeated QueryTrip trips = 3;
@@ -47,8 +47,8 @@ message QueryTrip {
 // instead of a `datetime` object.
 message QueryTransitEvent {
   // Date time of the event
-  cmp.types.v1alpha.Date date = 1;
+  cmp.types.v1.Date date = 1;
 
   // Event location
-  cmp.types.v1alpha.LocationCode location_code = 2;
+  cmp.types.v1.LocationCode location_code = 2;
 }
diff --git a/proto/cmp/services/transport/v1alpha/search_result_types.proto b/proto/cmp/services/transport/v1/search_result_types.proto
similarity index 62%
rename from proto/cmp/services/transport/v1alpha/search_result_types.proto
rename to proto/cmp/services/transport/v1/search_result_types.proto
index a7c5ac7d..fbb7a3e3 100644
--- a/proto/cmp/services/transport/v1alpha/search_result_types.proto
+++ b/proto/cmp/services/transport/v1/search_result_types.proto
@@ -1,20 +1,20 @@
 syntax = "proto3";
 
-package cmp.services.transport.v1alpha;
+package cmp.services.transport.v1;
 
-import "cmp/services/transport/v1alpha/trip_types.proto";
-import "cmp/types/v1alpha/bookability.proto";
-import "cmp/types/v1alpha/cancel_policy.proto";
-import "cmp/types/v1alpha/change_policy.proto";
-import "cmp/types/v1alpha/datetime_range.proto";
-import "cmp/types/v1alpha/link.proto";
-import "cmp/types/v1alpha/price.proto";
-import "cmp/types/v1alpha/rate.proto";
+import "cmp/services/transport/v1/trip_types.proto";
+import "cmp/types/v1/bookability.proto";
+import "cmp/types/v1/cancel_policy.proto";
+import "cmp/types/v1/change_policy.proto";
+import "cmp/types/v1/datetime_range.proto";
+import "cmp/types/v1/link.proto";
+import "cmp/types/v1/price.proto";
+import "cmp/types/v1/rate.proto";
 
 // Transport search result
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1alpha/search_result_types.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1alpha/search_result_types.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1/search_result_types.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1/search_result_types.proto.dot.svg)
 message TransportSearchResult {
   // Unique result ID
   int32 result_id = 1;
@@ -41,29 +41,29 @@ message TransportSearchResult {
   repeated Trip travelling_trips = 5;
 
   // Total Price
-  cmp.types.v1alpha.PriceDetail total_price = 6;
+  cmp.types.v1.PriceDetail total_price = 6;
 
   // Rate Rules
-  repeated cmp.types.v1alpha.RateRule rate_rules = 7;
+  repeated cmp.types.v1.RateRule rate_rules = 7;
 
   // Links
-  repeated cmp.types.v1alpha.Link links = 8;
+  repeated cmp.types.v1.Link links = 8;
 
   // Status of the result, whether it is immediately bookable or not
-  cmp.types.v1alpha.Bookability bookability = 9;
+  cmp.types.v1.Bookability bookability = 9;
 
   // Validity of the search option.
   //
   // `DateTimeRange` type with `start_date` and `end_date` in which the option can
   // be booked. If the start_date is omitted, the offer can be booked until the
   // end-date.
-  cmp.types.v1alpha.DateTimeRange validity = 10;
+  cmp.types.v1.DateTimeRange validity = 10;
 
   // Cancel Policy
-  cmp.types.v1alpha.CancelPolicy cancel_policy = 11;
+  cmp.types.v1.CancelPolicy cancel_policy = 11;
 
   // Change Policy
-  cmp.types.v1alpha.ChangePolicy change_policy = 12;
+  cmp.types.v1.ChangePolicy change_policy = 12;
 
   // Observations
   string observations = 13;
diff --git a/proto/cmp/services/transport/v1alpha/trip_types.proto b/proto/cmp/services/transport/v1/trip_types.proto
similarity index 79%
rename from proto/cmp/services/transport/v1alpha/trip_types.proto
rename to proto/cmp/services/transport/v1/trip_types.proto
index be6879e8..3298b435 100644
--- a/proto/cmp/services/transport/v1alpha/trip_types.proto
+++ b/proto/cmp/services/transport/v1/trip_types.proto
@@ -1,20 +1,20 @@
 syntax = "proto3";
 
-package cmp.services.transport.v1alpha;
-
-import "cmp/types/v1alpha/baggage.proto";
-import "cmp/types/v1alpha/duration.proto";
-import "cmp/types/v1alpha/location.proto";
-import "cmp/types/v1alpha/measurement.proto";
-import "cmp/types/v1alpha/price.proto";
-import "cmp/types/v1alpha/product_code.proto";
-import "cmp/types/v1alpha/service_fact.proto";
+package cmp.services.transport.v1;
+
+import "cmp/types/v1/baggage.proto";
+import "cmp/types/v1/duration.proto";
+import "cmp/types/v1/location.proto";
+import "cmp/types/v1/measurement.proto";
+import "cmp/types/v1/price.proto";
+import "cmp/types/v1/product_code.proto";
+import "cmp/types/v1/service_fact.proto";
 import "google/protobuf/timestamp.proto";
 
 // This message type represents a one way trip, either travelling or returning.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1alpha/trip_types.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1alpha/trip_types.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1/trip_types.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/services/transport/v1/trip_types.proto.dot.svg)
 message Trip {
   // Departure and Arrival dates and times can be derrived from the first and last segments
   // Trip segments are the legs offered
@@ -27,7 +27,7 @@ message TransitEvent {
   google.protobuf.Timestamp date_time = 1;
 
   // Event location
-  cmp.types.v1alpha.LocationCode location_code = 2;
+  cmp.types.v1.LocationCode location_code = 2;
 }
 
 // A segment of a trip
@@ -63,11 +63,11 @@ message TripSegment {
   // Eurostar, but others just use a code or a number (SNCF).
   //
   // Transfers are often identified by just a product code servicing an area.
-  cmp.types.v1alpha.ProductCode product_code = 5;
+  cmp.types.v1.ProductCode product_code = 5;
 
   // Supplier specific code, matching the supplier code in ProductList and ProductInfo
   // messages
-  cmp.types.v1alpha.SupplierProductCode supplier_code = 6;
+  cmp.types.v1.SupplierProductCode supplier_code = 6;
 
   // Departure
   TransitEvent departure = 7;
@@ -94,15 +94,15 @@ message TripSegment {
   // Included, optional or compulsary services for this segment or leg. Just a code and
   // description can be included if it is a package (seat, priority, large carry-on).
   // or a price detail can be included for optionally pre-ordered meals for example.
-  repeated cmp.types.v1alpha.ServiceFact services = 11;
+  repeated cmp.types.v1.ServiceFact services = 11;
 
   // Segment duration in minutes
-  cmp.types.v1alpha.Duration segment_duration = 12;
+  cmp.types.v1.Duration segment_duration = 12;
 
   // Segment Distance
   //
   // Ex: `Length(value=15, unit=LengthUnit.DISTANCE_UNIT_KILOMETERS)`
-  cmp.types.v1alpha.Length segment_distance = 13;
+  cmp.types.v1.Length segment_distance = 13;
 
   // Min PAX
   //
@@ -117,10 +117,10 @@ message TripSegment {
   // Luggage
   //
   // Ex: `3`
-  cmp.types.v1alpha.Baggage baggage = 16;
+  cmp.types.v1.Baggage baggage = 16;
 
   // Price
   //
   // Ex: `Price(net=240, currency=Currency.CURRENCY_EUR)
-  cmp.types.v1alpha.Price price = 17;
+  cmp.types.v1.Price price = 17;
 }
diff --git a/proto/cmp/types/v1alpha/address.proto b/proto/cmp/types/v1/address.proto
similarity index 65%
rename from proto/cmp/types/v1alpha/address.proto
rename to proto/cmp/types/v1/address.proto
index 2d7fe45d..5948bfe8 100644
--- a/proto/cmp/types/v1alpha/address.proto
+++ b/proto/cmp/types/v1/address.proto
@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/location.proto";
+import "cmp/types/v1/location.proto";
 
 // This type represents an address for places like a home or hotel etc.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/address.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/address.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/address.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/address.proto.dot.svg)
 message Address {
   string line_1 = 1;
   string line_2 = 2;
diff --git a/proto/cmp/types/v1alpha/amenity.proto b/proto/cmp/types/v1/amenity.proto
similarity index 88%
rename from proto/cmp/types/v1alpha/amenity.proto
rename to proto/cmp/types/v1/amenity.proto
index e9f0dc66..6b10890b 100644
--- a/proto/cmp/types/v1alpha/amenity.proto
+++ b/proto/cmp/types/v1/amenity.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Amenity message type
 //
@@ -31,8 +31,8 @@ package cmp.types.v1alpha;
 // )
 // ```
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/amenity.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/amenity.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/amenity.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/amenity.proto.dot.svg)
 message Amenity {
   // Amenity type like INTERNET, POOL, FOOD_BEVERAGE
   AmenityType type = 1;
diff --git a/proto/cmp/types/v1alpha/baggage.proto b/proto/cmp/types/v1/baggage.proto
similarity index 87%
rename from proto/cmp/types/v1alpha/baggage.proto
rename to proto/cmp/types/v1/baggage.proto
index d17bd403..bfea5c04 100644
--- a/proto/cmp/types/v1alpha/baggage.proto
+++ b/proto/cmp/types/v1/baggage.proto
@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/measurement.proto";
+import "cmp/types/v1/measurement.proto";
 
 // Baggage message type
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/baggage.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/baggage.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/baggage.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/baggage.proto.dot.svg)
 message Baggage {
   // Baggage type
   //
diff --git a/proto/cmp/types/v1alpha/bed.proto b/proto/cmp/types/v1/bed.proto
similarity index 69%
rename from proto/cmp/types/v1alpha/bed.proto
rename to proto/cmp/types/v1/bed.proto
index 6dee4a0a..bb885db9 100644
--- a/proto/cmp/types/v1alpha/bed.proto
+++ b/proto/cmp/types/v1/bed.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/bed.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/bed.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/bed.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/bed.proto.dot.svg)
 message Bed {
   BedType type = 1;
   int32 count = 2;
diff --git a/proto/cmp/types/v1alpha/bookability.proto b/proto/cmp/types/v1/bookability.proto
similarity index 71%
rename from proto/cmp/types/v1alpha/bookability.proto
rename to proto/cmp/types/v1/bookability.proto
index 30542910..3af93074 100644
--- a/proto/cmp/types/v1alpha/bookability.proto
+++ b/proto/cmp/types/v1/bookability.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/time.proto";
+import "cmp/types/v1/time.proto";
 
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/bookability.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/bookability.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/bookability.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/bookability.proto.dot.svg)
 message Bookability {
   BookabilityType type = 1;
 
@@ -13,7 +13,7 @@ message Bookability {
   // the supplier. The supplier is to confirm the on-request booking with that
   // specified time. If confirmation id not provided, the booking is to be
   // considered "rejected".
-  cmp.types.v1alpha.Time confirmation_time = 2;
+  cmp.types.v1.Time confirmation_time = 2;
 }
 
 enum BookabilityType {
diff --git a/proto/cmp/types/v1alpha/cancel_policy.proto b/proto/cmp/types/v1/cancel_policy.proto
similarity index 86%
rename from proto/cmp/types/v1alpha/cancel_policy.proto
rename to proto/cmp/types/v1/cancel_policy.proto
index fc181d82..6eb22b39 100644
--- a/proto/cmp/types/v1alpha/cancel_policy.proto
+++ b/proto/cmp/types/v1/cancel_policy.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/datetime_range.proto";
-import "cmp/types/v1alpha/price.proto";
+import "cmp/types/v1/datetime_range.proto";
+import "cmp/types/v1/price.proto";
 import "google/protobuf/timestamp.proto";
 
 // Cancellation Policy: The cancellation policy section consists of 3 options:
@@ -12,8 +12,8 @@ import "google/protobuf/timestamp.proto";
 // - A "free cancellation upto" DateTime
 // - Complete cancellation policies with from/to DateTime stamps
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/cancel_policy.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/cancel_policy.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/cancel_policy.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/cancel_policy.proto.dot.svg)
 message CancelPolicy {
   // the search result is refundable or not (at least one cancellation penalty exists
   // that provides a (partial) refund)
@@ -42,11 +42,11 @@ message CancelPolicy {
 message CancelPenalty {
   // When this penalty is valid. Either use the start and end date of the DateTime
   // range
-  cmp.types.v1alpha.DateTimeRange datetime_range = 1;
+  cmp.types.v1.DateTimeRange datetime_range = 1;
 
   // Penalty value. Percentages of the selling price are purposely not allowed for
   // simplicity and uniformity.
-  cmp.types.v1alpha.Price value = 2;
+  cmp.types.v1.Price value = 2;
 
   // Description of the penalty in a non computable manner. The Description should
   // be in the language that is specified in the request.
diff --git a/proto/cmp/types/v1alpha/change_policy.proto b/proto/cmp/types/v1/change_policy.proto
similarity index 86%
rename from proto/cmp/types/v1alpha/change_policy.proto
rename to proto/cmp/types/v1/change_policy.proto
index 021d1ad0..b8257b20 100644
--- a/proto/cmp/types/v1alpha/change_policy.proto
+++ b/proto/cmp/types/v1/change_policy.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/datetime_range.proto";
-import "cmp/types/v1alpha/price.proto";
+import "cmp/types/v1/datetime_range.proto";
+import "cmp/types/v1/price.proto";
 import "google/protobuf/timestamp.proto";
 
 // Change Policy: The change policy section consists of 3 options:
@@ -12,8 +12,8 @@ import "google/protobuf/timestamp.proto";
 // - A "free change upto" DateTime for a search result
 // - Multiple change types with start/end DateTime stamps for a search result
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/change_policy.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/change_policy.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/change_policy.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/change_policy.proto.dot.svg)
 message ChangePolicy {
   // the search result is changeable or not (at least one change type exists)
   bool change_allowed = 1;
@@ -45,11 +45,11 @@ message ChangeType {
 
   // When this change type and date is valid. Either use the start and end date of
   // the DateTime range
-  cmp.types.v1alpha.DateTimeRange datetime_range = 2;
+  cmp.types.v1.DateTimeRange datetime_range = 2;
 
   // change fee. Percentages of the selling price are purposely not allowed for
   // simplicity and uniformity.
-  cmp.types.v1alpha.Price value = 3;
+  cmp.types.v1.Price value = 3;
 
   // Description of the change in a non computable manner. The Description should be
   // in the language that is specified in the request.
diff --git a/proto/cmp/types/v1alpha/common.proto b/proto/cmp/types/v1/common.proto
similarity index 95%
rename from proto/cmp/types/v1alpha/common.proto
rename to proto/cmp/types/v1/common.proto
index 65d7929c..07a7e8a6 100644
--- a/proto/cmp/types/v1alpha/common.proto
+++ b/proto/cmp/types/v1/common.proto
@@ -28,12 +28,12 @@ syntax = "proto3";
 // the trips in this order it is defined that the trip in the middle is a same day return
 // LAS to LAX and not LAX to LAS as then it should have been specified as travelling 15 June
 // LAX->LAS, travelling 15 June LAS->LAX.
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // ### CM Message Header
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/common.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/common.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/common.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/common.proto.dot.svg)
 message Header {
   // Protocol Version
   // The request and response should always hold the true version implemented.
diff --git a/proto/cmp/types/v1/contact_info.proto b/proto/cmp/types/v1/contact_info.proto
new file mode 100644
index 00000000..cce793f0
--- /dev/null
+++ b/proto/cmp/types/v1/contact_info.proto
@@ -0,0 +1,26 @@
+syntax = "proto3";
+
+package cmp.types.v1;
+
+import "cmp/types/v1/address.proto";
+import "cmp/types/v1/email.proto";
+import "cmp/types/v1/link.proto";
+import "cmp/types/v1/phone.proto";
+
+// Contact Info for general use.
+//
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/contact_info.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/contact_info.proto.dot.svg)
+message ContactInfo {
+  // Address
+  repeated cmp.types.v1.Address address = 1;
+
+  // Phones
+  repeated cmp.types.v1.Phone phones = 2;
+
+  // Emails
+  repeated cmp.types.v1.Email emails = 3;
+
+  // Websites
+  repeated cmp.types.v1.Link links = 4;
+}
diff --git a/proto/cmp/types/v1alpha/content_source.proto b/proto/cmp/types/v1/content_source.proto
similarity index 75%
rename from proto/cmp/types/v1alpha/content_source.proto
rename to proto/cmp/types/v1/content_source.proto
index 2754269d..024f92ef 100644
--- a/proto/cmp/types/v1alpha/content_source.proto
+++ b/proto/cmp/types/v1/content_source.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Content Source Type message type. TODO: Add documentation to explain the purpose of this message
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/content_source.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/content_source.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/content_source.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/content_source.proto.dot.svg)
 enum ContentSourceType {
   CONTENT_SOURCE_TYPE_UNSPECIFIED = 0;
   CONTENT_SOURCE_TYPE_GDS = 1;
diff --git a/proto/cmp/types/v1alpha/country.proto b/proto/cmp/types/v1/country.proto
similarity index 98%
rename from proto/cmp/types/v1alpha/country.proto
rename to proto/cmp/types/v1/country.proto
index 7bae17c4..9160a4e0 100644
--- a/proto/cmp/types/v1alpha/country.proto
+++ b/proto/cmp/types/v1/country.proto
@@ -1,12 +1,12 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Country options according to ISO 3166-1, with the 31 most popular countries
 // first, using fewer bytes in the code thus reducing message size.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/country.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/country.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/country.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/country.proto.dot.svg)
 enum Country {
   COUNTRY_UNSPECIFIED = 0;
 
diff --git a/proto/cmp/types/v1alpha/credit_card.proto b/proto/cmp/types/v1/credit_card.proto
similarity index 72%
rename from proto/cmp/types/v1alpha/credit_card.proto
rename to proto/cmp/types/v1/credit_card.proto
index afed2cee..a002cde5 100644
--- a/proto/cmp/types/v1alpha/credit_card.proto
+++ b/proto/cmp/types/v1/credit_card.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/date.proto";
+import "cmp/types/v1/date.proto";
 
 message CreditCard {
   // FIXME: Can we use an int64 to represent a credit card number?
diff --git a/proto/cmp/types/v1alpha/currency.proto b/proto/cmp/types/v1/currency.proto
similarity index 96%
rename from proto/cmp/types/v1alpha/currency.proto
rename to proto/cmp/types/v1/currency.proto
index 7b6add39..c8c76228 100644
--- a/proto/cmp/types/v1alpha/currency.proto
+++ b/proto/cmp/types/v1/currency.proto
@@ -1,16 +1,16 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/token.proto";
+import "cmp/types/v1/token.proto";
 import "google/protobuf/empty.proto";
 
 // See extensive explanation at Price in price.proto
 message Currency {
   oneof currency {
-    cmp.types.v1alpha.IsoCurrency iso_currency = 1;
+    cmp.types.v1.IsoCurrency iso_currency = 1;
 
-    cmp.types.v1alpha.TokenCurrency token_currency = 2;
+    cmp.types.v1.TokenCurrency token_currency = 2;
 
     google.protobuf.Empty native_token = 3;
   }
@@ -21,8 +21,8 @@ message Currency {
 // First 20 currencies are the most traded currencies in the world. This is done to
 // optimize the size of the protobuf message size.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/currency.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/currency.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/currency.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/currency.proto.dot.svg)
 enum IsoCurrency {
   ISO_CURRENCY_UNSPECIFIED = 0; // Placeholder or unspecified currency
 
diff --git a/proto/cmp/types/v1alpha/date.proto b/proto/cmp/types/v1/date.proto
similarity index 67%
rename from proto/cmp/types/v1alpha/date.proto
rename to proto/cmp/types/v1/date.proto
index b5a3db46..fc1799c0 100644
--- a/proto/cmp/types/v1alpha/date.proto
+++ b/proto/cmp/types/v1/date.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Date message that includes year, month and day as integers.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/date.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/date.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/date.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/date.proto.dot.svg)
 message Date {
   int32 year = 1;
   int32 month = 2;
diff --git a/proto/cmp/types/v1alpha/datetime_range.proto b/proto/cmp/types/v1/datetime_range.proto
similarity index 70%
rename from proto/cmp/types/v1alpha/datetime_range.proto
rename to proto/cmp/types/v1/datetime_range.proto
index cd694bd5..0e481853 100644
--- a/proto/cmp/types/v1alpha/datetime_range.proto
+++ b/proto/cmp/types/v1/datetime_range.proto
@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 import "google/protobuf/timestamp.proto";
 
 // Date range message that includes start and end datetime as timestamps.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/datetime_range.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/datetime_range.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/datetime_range.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/datetime_range.proto.dot.svg)
 message DateTimeRange {
   google.protobuf.Timestamp start_datetime = 1;
   google.protobuf.Timestamp end_datetime = 2;
diff --git a/proto/cmp/types/v1alpha/delivery.proto b/proto/cmp/types/v1/delivery.proto
similarity index 80%
rename from proto/cmp/types/v1alpha/delivery.proto
rename to proto/cmp/types/v1/delivery.proto
index 03a559de..a6e4868a 100644
--- a/proto/cmp/types/v1alpha/delivery.proto
+++ b/proto/cmp/types/v1/delivery.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Delivery Formats and Methods
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/delivery.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/delivery.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/delivery.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/delivery.proto.dot.svg)
 enum DeliveryFormat {
   DELIVERY_FORMAT_UNSPECIFIED = 0;
   DELIVERY_FORMAT_OTHER = 1;
diff --git a/proto/cmp/types/v1alpha/description.proto b/proto/cmp/types/v1/description.proto
similarity index 71%
rename from proto/cmp/types/v1alpha/description.proto
rename to proto/cmp/types/v1/description.proto
index 54d52dfd..2ab4e8cc 100644
--- a/proto/cmp/types/v1alpha/description.proto
+++ b/proto/cmp/types/v1/description.proto
@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/language.proto";
+import "cmp/types/v1/language.proto";
 
 // Localized description set for a given language
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/description.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/description.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/description.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/description.proto.dot.svg)
 message LocalizedDescriptionSet {
   // Language
   Language language = 1;
diff --git a/proto/cmp/types/v1alpha/document.proto b/proto/cmp/types/v1/document.proto
similarity index 89%
rename from proto/cmp/types/v1alpha/document.proto
rename to proto/cmp/types/v1/document.proto
index 3d49a6c4..ce87c687 100644
--- a/proto/cmp/types/v1alpha/document.proto
+++ b/proto/cmp/types/v1/document.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Document type to be used in various messages
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/document.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/document.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/document.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/document.proto.dot.svg)
 message Document {
   string document_number = 1;
   DocumentType document_type = 2;
diff --git a/proto/cmp/types/v1alpha/dow.proto b/proto/cmp/types/v1/dow.proto
similarity index 91%
rename from proto/cmp/types/v1alpha/dow.proto
rename to proto/cmp/types/v1/dow.proto
index a7b53e88..413f623b 100644
--- a/proto/cmp/types/v1alpha/dow.proto
+++ b/proto/cmp/types/v1/dow.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // DOW means DayOfWeek and is used to determine specific arrival days of the week a
 // customer would like to go on holidays for example only travelling on a Saturday
@@ -25,8 +25,8 @@ package cmp.types.v1alpha;
 // | Exponent | 2^6       | 2^5        | 2^4      | 2^3        | 2^2       | 2^1       | 2^0      |
 // | Result   | 64        | 32         | 16       | 8          | 4         | 2         | 1        |
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/dow.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/dow.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/dow.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/dow.proto.dot.svg)
 message DayOfWeek {
   int32 dow = 1;
 }
diff --git a/proto/cmp/types/v1alpha/duration.proto b/proto/cmp/types/v1/duration.proto
similarity index 71%
rename from proto/cmp/types/v1alpha/duration.proto
rename to proto/cmp/types/v1/duration.proto
index a7cf44a9..3c237f6c 100644
--- a/proto/cmp/types/v1alpha/duration.proto
+++ b/proto/cmp/types/v1/duration.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Time duration in minutes
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/duration.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/duration.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/duration.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/duration.proto.dot.svg)
 message Duration {
   int32 minutes = 1;
 }
diff --git a/proto/cmp/types/v1alpha/email.proto b/proto/cmp/types/v1/email.proto
similarity index 91%
rename from proto/cmp/types/v1alpha/email.proto
rename to proto/cmp/types/v1/email.proto
index 7a068745..1f422c0d 100644
--- a/proto/cmp/types/v1alpha/email.proto
+++ b/proto/cmp/types/v1/email.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Email type for general use.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/email.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/email.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/email.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/email.proto.dot.svg)
 message Email {
   string address = 1;
 
diff --git a/proto/cmp/types/v1alpha/file.proto b/proto/cmp/types/v1/file.proto
similarity index 88%
rename from proto/cmp/types/v1alpha/file.proto
rename to proto/cmp/types/v1/file.proto
index 63971419..ab4c05c6 100644
--- a/proto/cmp/types/v1alpha/file.proto
+++ b/proto/cmp/types/v1/file.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 import "google/protobuf/timestamp.proto";
 
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/file.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/file.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/file.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/file.proto.dot.svg)
 message File {
   // file name
   string name = 1;
diff --git a/proto/cmp/types/v1alpha/filter.proto b/proto/cmp/types/v1/filter.proto
similarity index 94%
rename from proto/cmp/types/v1alpha/filter.proto
rename to proto/cmp/types/v1/filter.proto
index f9c2c71a..66c00546 100644
--- a/proto/cmp/types/v1alpha/filter.proto
+++ b/proto/cmp/types/v1/filter.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Upfront filtering of possible search options in the search response
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/filter.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/filter.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/filter.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/filter.proto.dot.svg)
 message Filter {
   // Filters can be based on a type of a specific code standard or codes agreed
   // between provider and distributor in which case the type can be set to
diff --git a/proto/cmp/types/v1alpha/language.proto b/proto/cmp/types/v1/language.proto
similarity index 97%
rename from proto/cmp/types/v1alpha/language.proto
rename to proto/cmp/types/v1/language.proto
index 377438a6..db4bb834 100644
--- a/proto/cmp/types/v1alpha/language.proto
+++ b/proto/cmp/types/v1/language.proto
@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Language options according to ISO 639-1, with the 26 most popular languages
 // first. This is done to use the smaller values more frequently and thus consume
 // less bytes for this field.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/language.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/language.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/language.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/language.proto.dot.svg)
 enum Language {
   LANGUAGE_UNSPECIFIED = 0;
   LANGUAGE_AR = 1; // Arabic
diff --git a/proto/cmp/types/v1alpha/link.proto b/proto/cmp/types/v1/link.proto
similarity index 87%
rename from proto/cmp/types/v1alpha/link.proto
rename to proto/cmp/types/v1/link.proto
index b57b05d0..4ff605aa 100644
--- a/proto/cmp/types/v1alpha/link.proto
+++ b/proto/cmp/types/v1/link.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Link is used to represent websites, social media contact, online check-in url, ... etc
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/link.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/link.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/link.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/link.proto.dot.svg)
 message Link {
   // Link type
   //
diff --git a/proto/cmp/types/v1alpha/localized.proto b/proto/cmp/types/v1/localized.proto
similarity index 57%
rename from proto/cmp/types/v1alpha/localized.proto
rename to proto/cmp/types/v1/localized.proto
index 8df3d83d..1c9b5f9d 100644
--- a/proto/cmp/types/v1alpha/localized.proto
+++ b/proto/cmp/types/v1/localized.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/language.proto";
+import "cmp/types/v1/language.proto";
 
 message LocalizedString {
   string text = 1;
diff --git a/proto/cmp/types/v1alpha/location.proto b/proto/cmp/types/v1/location.proto
similarity index 88%
rename from proto/cmp/types/v1alpha/location.proto
rename to proto/cmp/types/v1/location.proto
index 61eb0519..824822b8 100644
--- a/proto/cmp/types/v1alpha/location.proto
+++ b/proto/cmp/types/v1/location.proto
@@ -1,16 +1,16 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/country.proto";
-import "cmp/types/v1alpha/measurement.proto";
+import "cmp/types/v1/country.proto";
+import "cmp/types/v1/measurement.proto";
 
 // ### Coordinate
 //
 // Represents a geographic location
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/location.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/location.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/location.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/location.proto.dot.svg)
 message Coordinates {
   // The latitude in degrees. It must be in the range [-90.0, +90.0].
   double latitude = 1;
@@ -20,14 +20,14 @@ message Coordinates {
 
 // Geo Circle
 message GeoCircle {
-  cmp.types.v1alpha.Coordinates center = 1;
-  cmp.types.v1alpha.Length radius = 2;
+  cmp.types.v1.Coordinates center = 1;
+  cmp.types.v1.Length radius = 2;
 }
 
 // Geo Polygon
 message GeoPolygon {
   // GPS points of the polygon
-  repeated cmp.types.v1alpha.Coordinates points = 1;
+  repeated cmp.types.v1.Coordinates points = 1;
 }
 
 // Geo Tree
diff --git a/proto/cmp/types/v1alpha/meal_plan.proto b/proto/cmp/types/v1/meal_plan.proto
similarity index 89%
rename from proto/cmp/types/v1alpha/meal_plan.proto
rename to proto/cmp/types/v1/meal_plan.proto
index 60aca000..692bc2e4 100644
--- a/proto/cmp/types/v1alpha/meal_plan.proto
+++ b/proto/cmp/types/v1/meal_plan.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Meal Plan message type
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/meal_plan.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/meal_plan.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/meal_plan.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/meal_plan.proto.dot.svg)
 message MealPlan {
   // Meal Plan Code
   //
diff --git a/proto/cmp/types/v1alpha/measurement.proto b/proto/cmp/types/v1/measurement.proto
similarity index 86%
rename from proto/cmp/types/v1alpha/measurement.proto
rename to proto/cmp/types/v1/measurement.proto
index 24066f94..cb0982ce 100644
--- a/proto/cmp/types/v1alpha/measurement.proto
+++ b/proto/cmp/types/v1/measurement.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Length
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/measurement.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/measurement.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/measurement.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/measurement.proto.dot.svg)
 message Length {
   int32 value = 1;
   LengthUnit unit = 2;
diff --git a/proto/cmp/types/v1alpha/partner.proto b/proto/cmp/types/v1/partner.proto
similarity index 88%
rename from proto/cmp/types/v1alpha/partner.proto
rename to proto/cmp/types/v1/partner.proto
index f498d959..09a06276 100644
--- a/proto/cmp/types/v1alpha/partner.proto
+++ b/proto/cmp/types/v1/partner.proto
@@ -1,14 +1,14 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/token.proto";
-import "cmp/types/v1alpha/wallet.proto";
+import "cmp/types/v1/token.proto";
+import "cmp/types/v1/wallet.proto";
 
 // ### Partner message type
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/partner.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/partner.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/partner.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/partner.proto.dot.svg)
 message Partner {
   // Short name of the partner. Ex: Chain4Travel
   string short_name = 1;
@@ -45,11 +45,11 @@ message Partner {
   repeated PartnerService services = 7;
 
   // Partner addresses of the messenger bots
-  repeated cmp.types.v1alpha.WalletAddress addresses = 8;
+  repeated cmp.types.v1.WalletAddress addresses = 8;
 
   // Partner's consortium member wallet address. This address should be the one who
   // creates the entry in Partner Configuration on the chain.
-  cmp.types.v1alpha.WalletAddress partner_wallet_address = 9;
+  cmp.types.v1.WalletAddress partner_wallet_address = 9;
 }
 
 // Partner Service
@@ -63,12 +63,12 @@ message PartnerService {
   // which means partner will need to update supported services with every new
   // version.
   //
-  // Ex: "cmp.services.accommodation.v1alpha.AccommodationSearchService"
+  // Ex: "cmp.services.accommodation.v1.AccommodationSearchService"
   string service_name = 1;
 
   // Response of the service.
   //
-  // Ex: "cmp.services.accommodation.v1alpha.AccommodationSearchResponse"
+  // Ex: "cmp.services.accommodation.v1.AccommodationSearchResponse"
   //
   // FIXME: Do we need this? One can check the service definition and see the
   // response message type.
@@ -77,7 +77,7 @@ message PartnerService {
   // Result field
   //
   // Ex: "options" representing the field at
-  // "cmp.services.accommodation.v1alpha.AccommodationSearchResponse.options" which
+  // "cmp.services.accommodation.v1.AccommodationSearchResponse.options" which
   // is a SearchOption type
   string result_field = 3;
 
diff --git a/proto/cmp/types/v1alpha/payment.proto b/proto/cmp/types/v1/payment.proto
similarity index 72%
rename from proto/cmp/types/v1alpha/payment.proto
rename to proto/cmp/types/v1/payment.proto
index 0bc410c9..1cc7f7b7 100644
--- a/proto/cmp/types/v1alpha/payment.proto
+++ b/proto/cmp/types/v1/payment.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/credit_card.proto";
+import "cmp/types/v1/credit_card.proto";
 
 // Additional payment info message with currently only a single field of
 // `CreditCard` message type.
diff --git a/proto/cmp/types/v1alpha/phone.proto b/proto/cmp/types/v1/phone.proto
similarity index 90%
rename from proto/cmp/types/v1alpha/phone.proto
rename to proto/cmp/types/v1/phone.proto
index c2511ea3..c9623c7a 100644
--- a/proto/cmp/types/v1alpha/phone.proto
+++ b/proto/cmp/types/v1/phone.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Phone type to be used in various types as hotels, holiday homes etc.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/phone.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/phone.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/phone.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/phone.proto.dot.svg)
 message Phone {
   string number = 1;
 
diff --git a/proto/cmp/types/v1alpha/price.proto b/proto/cmp/types/v1/price.proto
similarity index 93%
rename from proto/cmp/types/v1alpha/price.proto
rename to proto/cmp/types/v1/price.proto
index b90db405..94e50ffb 100644
--- a/proto/cmp/types/v1alpha/price.proto
+++ b/proto/cmp/types/v1/price.proto
@@ -1,9 +1,9 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/currency.proto";
-import "cmp/types/v1alpha/price_type.proto";
+import "cmp/types/v1/currency.proto";
+import "cmp/types/v1/price_type.proto";
 
 // ### PriceDetail
 //
@@ -13,8 +13,8 @@ import "cmp/types/v1alpha/price_type.proto";
 // Breakdown is a recursively inherited object of PriceDetail. This way complex
 // pricing structures can be represented.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/price.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/price.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/price.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/price.proto.dot.svg)
 message PriceDetail {
   // Principle price element
   Price price = 1;
diff --git a/proto/cmp/types/v1alpha/price_type.proto b/proto/cmp/types/v1/price_type.proto
similarity index 99%
rename from proto/cmp/types/v1alpha/price_type.proto
rename to proto/cmp/types/v1/price_type.proto
index ca2d1abe..ec6ad389 100644
--- a/proto/cmp/types/v1alpha/price_type.proto
+++ b/proto/cmp/types/v1/price_type.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // The ChargeType defines whether a price is per person, per group or per unit. Enum
 // might be amended upon request.
diff --git a/proto/cmp/types/v1alpha/product_code.proto b/proto/cmp/types/v1/product_code.proto
similarity index 94%
rename from proto/cmp/types/v1alpha/product_code.proto
rename to proto/cmp/types/v1/product_code.proto
index a5f7e122..4481d0a7 100644
--- a/proto/cmp/types/v1alpha/product_code.proto
+++ b/proto/cmp/types/v1/product_code.proto
@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Product code and type
 //
 // This is being used in requests to specify the a list of products to be included in the reponse
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/product_code.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/product_code.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/product_code.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/product_code.proto.dot.svg)
 message ProductCode {
   // In most cases like in accommodation, just the field "code" and "type" will be
   // used. For example in case of a GiataID (for example code=182568), a provider
diff --git a/proto/cmp/types/v1alpha/product_status.proto b/proto/cmp/types/v1/product_status.proto
similarity index 72%
rename from proto/cmp/types/v1alpha/product_status.proto
rename to proto/cmp/types/v1/product_status.proto
index 9530aed1..fe8d95bd 100644
--- a/proto/cmp/types/v1alpha/product_status.proto
+++ b/proto/cmp/types/v1/product_status.proto
@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Product Status
 //
 // This is being used in responses to specify the status of a product of any message type.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/product_status.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/product_status.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/product_status.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/product_status.proto.dot.svg)
 enum ProductStatus {
   PRODUCT_STATUS_UNSPECIFIED = 0;
   PRODUCT_STATUS_NEW = 1;
diff --git a/proto/cmp/types/v1alpha/pubkey.proto b/proto/cmp/types/v1/pubkey.proto
similarity index 69%
rename from proto/cmp/types/v1alpha/pubkey.proto
rename to proto/cmp/types/v1/pubkey.proto
index 33a9fbc1..c64a17e9 100644
--- a/proto/cmp/types/v1alpha/pubkey.proto
+++ b/proto/cmp/types/v1/pubkey.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 message PublicKey {
   string key = 1;
diff --git a/proto/cmp/types/v1alpha/rate.proto b/proto/cmp/types/v1/rate.proto
similarity index 95%
rename from proto/cmp/types/v1alpha/rate.proto
rename to proto/cmp/types/v1/rate.proto
index 76b645fe..185729d4 100644
--- a/proto/cmp/types/v1alpha/rate.proto
+++ b/proto/cmp/types/v1/rate.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Rate Rule
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/rate.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/rate.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/rate.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/rate.proto.dot.svg)
 message RateRule {
   // RateRule
   //
diff --git a/proto/cmp/types/v1alpha/redemption.proto b/proto/cmp/types/v1/redemption.proto
similarity index 70%
rename from proto/cmp/types/v1alpha/redemption.proto
rename to proto/cmp/types/v1/redemption.proto
index 55db80b3..74576d95 100644
--- a/proto/cmp/types/v1alpha/redemption.proto
+++ b/proto/cmp/types/v1/redemption.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Redemption Methods
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/redemption.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/redemption.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/redemption.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/redemption.proto.dot.svg)
 enum RedemptionMethod {
   REDEMPTION_METHOD_UNSPECIFIED = 0;
   REDEMPTION_METHOD_OTHER = 1;
diff --git a/proto/cmp/types/v1alpha/search.proto b/proto/cmp/types/v1/search.proto
similarity index 89%
rename from proto/cmp/types/v1alpha/search.proto
rename to proto/cmp/types/v1/search.proto
index b9f5400c..f5f7eb0b 100644
--- a/proto/cmp/types/v1alpha/search.proto
+++ b/proto/cmp/types/v1/search.proto
@@ -1,19 +1,19 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/content_source.proto";
-import "cmp/types/v1alpha/country.proto";
-import "cmp/types/v1alpha/currency.proto";
-import "cmp/types/v1alpha/filter.proto";
-import "cmp/types/v1alpha/language.proto";
-import "cmp/types/v1alpha/sorting.proto";
-import "cmp/types/v1alpha/uuid.proto";
+import "cmp/types/v1/content_source.proto";
+import "cmp/types/v1/country.proto";
+import "cmp/types/v1/currency.proto";
+import "cmp/types/v1/filter.proto";
+import "cmp/types/v1/language.proto";
+import "cmp/types/v1/sorting.proto";
+import "cmp/types/v1/uuid.proto";
 
 // Search parameters for the search requests
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/search.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/search.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/search.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/search.proto.dot.svg)
 message SearchParameters {
   // Requested currency in which prices have to be supplied in the response
   // according to ISO 4217 Currency codes
diff --git a/proto/cmp/types/v1alpha/seat_map.proto b/proto/cmp/types/v1/seat_map.proto
similarity index 92%
rename from proto/cmp/types/v1alpha/seat_map.proto
rename to proto/cmp/types/v1/seat_map.proto
index 6dd336ce..45bdefea 100644
--- a/proto/cmp/types/v1alpha/seat_map.proto
+++ b/proto/cmp/types/v1/seat_map.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/description.proto";
-import "cmp/types/v1alpha/file.proto";
-import "cmp/types/v1alpha/language.proto";
-import "cmp/types/v1alpha/localized.proto";
+import "cmp/types/v1/description.proto";
+import "cmp/types/v1/file.proto";
+import "cmp/types/v1/language.proto";
+import "cmp/types/v1/localized.proto";
 import "google/protobuf/wrappers.proto";
 
 // Represents a basic seat with optional features and restrictions. Each seat has a
@@ -43,7 +43,7 @@ message Section {
   string id = 1;
 
   // List of localized names Human readable names of the section
-  repeated cmp.types.v1alpha.LocalizedString names = 2;
+  repeated cmp.types.v1.LocalizedString names = 2;
 
   // Seats in this section.
   oneof seat_info {
@@ -60,11 +60,11 @@ message Section {
   // If set, it is assumed that this image is used for locating seats within the
   // section. (the `SeatLocation` message type in the `Seat` message above is
   // used to represent seat location inside this image).
-  cmp.types.v1alpha.Image image = 5;
+  cmp.types.v1.Image image = 5;
 
   // A list of localized descriptions for this section, useful for providing
   // information about features and amenities in multiple languages.
-  repeated cmp.types.v1alpha.LocalizedDescriptionSet localized_descriptions = 6;
+  repeated cmp.types.v1.LocalizedDescriptionSet localized_descriptions = 6;
 
   // Nested sections within this section, allowing for a hierarchical representation
   // of the venue's layout.
@@ -75,8 +75,8 @@ message Section {
 // of seating within a venue. This message provides a comprehensive overview of the
 // seating arrangement, including sections, images, and localized descriptions.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/seat_map.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/seat_map.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/seat_map.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/seat_map.proto.dot.svg)
 message SeatMap {
   // Unique identifier for the seat map
   string id = 1;
@@ -90,12 +90,12 @@ message SeatMap {
   // Image that provides a visual representation of the seat map, illustrating the
   // location and arrangement of seats. The image can be in vector format (SVG) or
   // bitmap format.
-  cmp.types.v1alpha.Image image = 3;
+  cmp.types.v1.Image image = 3;
 
   // A list of localized descriptions for the seat map. This can be used to describe
   // features and amenities of the seating arrangement in multiple languages.
   // The languages should match those requested in SeatMapRequest
-  repeated cmp.types.v1alpha.LocalizedDescriptionSet localized_descriptions = 4;
+  repeated cmp.types.v1.LocalizedDescriptionSet localized_descriptions = 4;
 }
 
 // List of _only_ seat IDs to be used for seat selection or seat availability.
diff --git a/proto/cmp/types/v1alpha/service_fact.proto b/proto/cmp/types/v1/service_fact.proto
similarity index 94%
rename from proto/cmp/types/v1alpha/service_fact.proto
rename to proto/cmp/types/v1/service_fact.proto
index e23a2815..62f6d705 100644
--- a/proto/cmp/types/v1alpha/service_fact.proto
+++ b/proto/cmp/types/v1/service_fact.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/price.proto";
+import "cmp/types/v1/price.proto";
 
 // Service fact message type
 // Service facts are smaller services that are included, can be booked optionally
@@ -17,8 +17,8 @@ import "cmp/types/v1alpha/price.proto";
 // which ski pass and what level of ski class that be properly selected.
 //
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/service_fact.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/service_fact.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/service_fact.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/service_fact.proto.dot.svg)
 message ServiceFact {
   // A code for the specific service, when a service is optional, this code is
   // referenced in the validate request, so that the optional service will be added
diff --git a/proto/cmp/types/v1alpha/sorting.proto b/proto/cmp/types/v1/sorting.proto
similarity index 82%
rename from proto/cmp/types/v1alpha/sorting.proto
rename to proto/cmp/types/v1/sorting.proto
index baddca51..b998069e 100644
--- a/proto/cmp/types/v1alpha/sorting.proto
+++ b/proto/cmp/types/v1/sorting.proto
@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Sorting type and order
 //
 // This is being used in requests to specify the sorting required in the response.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/sorting.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/sorting.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/sorting.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/sorting.proto.dot.svg)
 message Sorting {
   SortingType sorting_type = 1;
   SortingOrder sorting_order = 2;
diff --git a/proto/cmp/types/v1alpha/time.proto b/proto/cmp/types/v1/time.proto
similarity index 61%
rename from proto/cmp/types/v1alpha/time.proto
rename to proto/cmp/types/v1/time.proto
index a5ad5764..92ac6af3 100644
--- a/proto/cmp/types/v1alpha/time.proto
+++ b/proto/cmp/types/v1/time.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Time Message
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/time.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/time.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/time.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/time.proto.dot.svg)
 message Time {
   int32 hours = 1;
   int32 minutes = 2;
diff --git a/proto/cmp/types/v1alpha/token.proto b/proto/cmp/types/v1/token.proto
similarity index 77%
rename from proto/cmp/types/v1alpha/token.proto
rename to proto/cmp/types/v1/token.proto
index d42aaf32..924a070f 100644
--- a/proto/cmp/types/v1alpha/token.proto
+++ b/proto/cmp/types/v1/token.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Token Reference
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/token.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/token.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/token.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/token.proto.dot.svg)
 message TokenCurrency {
   string contract_address = 1;
 }
diff --git a/proto/cmp/types/v1alpha/travel_period.proto b/proto/cmp/types/v1/travel_period.proto
similarity index 84%
rename from proto/cmp/types/v1alpha/travel_period.proto
rename to proto/cmp/types/v1/travel_period.proto
index fd21df8e..47426954 100644
--- a/proto/cmp/types/v1alpha/travel_period.proto
+++ b/proto/cmp/types/v1/travel_period.proto
@@ -1,26 +1,26 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/date.proto";
-import "cmp/types/v1alpha/dow.proto";
+import "cmp/types/v1/date.proto";
+import "cmp/types/v1/dow.proto";
 
 // Travel Period
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/travel_period.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/travel_period.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/travel_period.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/travel_period.proto.dot.svg)
 message TravelPeriod {
   // Start date of a trip for messages where no Date/Time is required
   // (datetime_range.proto) when the travelling starts. Most trips will be for an
   // exact start and end date. In that case just these two fields are used. We
   // discourage the use of only a start date and Length of Stay.
-  cmp.types.v1alpha.Date start_date = 1;
+  cmp.types.v1.Date start_date = 1;
 
   // End date of a trip for messages where no Date/Time is required
   // (datetime_range.proto) when the travelling ends. The end date is different when
   // the trip is a one-way from point A to B compared to when the trip is a
   // fortnight holiday and the customers return home on the end date.
-  cmp.types.v1alpha.Date end_date = 2;
+  cmp.types.v1.Date end_date = 2;
 
   // Start and end date can be set wider than the desired length of a trip, so that
   // various alternatives can be considered.
@@ -48,5 +48,5 @@ message TravelPeriod {
   // travelling during weekdays.
   //
   // A bitmask is being used to express the DOW or DOWs.
-  cmp.types.v1alpha.DayOfWeek dow = 6;
+  cmp.types.v1.DayOfWeek dow = 6;
 }
diff --git a/proto/cmp/types/v1alpha/travel_type.proto b/proto/cmp/types/v1/travel_type.proto
similarity index 87%
rename from proto/cmp/types/v1alpha/travel_type.proto
rename to proto/cmp/types/v1/travel_type.proto
index 23107508..d37f30bf 100644
--- a/proto/cmp/types/v1alpha/travel_type.proto
+++ b/proto/cmp/types/v1/travel_type.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 enum TravelType {
   TRAVEL_TYPE_UNSPECIFIED = 0;
diff --git a/proto/cmp/types/v1alpha/traveller.proto b/proto/cmp/types/v1/traveller.proto
similarity index 84%
rename from proto/cmp/types/v1alpha/traveller.proto
rename to proto/cmp/types/v1/traveller.proto
index c5aaf633..3aeff4cb 100644
--- a/proto/cmp/types/v1alpha/traveller.proto
+++ b/proto/cmp/types/v1/traveller.proto
@@ -1,16 +1,16 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
-import "cmp/types/v1alpha/contact_info.proto";
-import "cmp/types/v1alpha/country.proto";
-import "cmp/types/v1alpha/date.proto";
-import "cmp/types/v1alpha/document.proto";
+import "cmp/types/v1/contact_info.proto";
+import "cmp/types/v1/country.proto";
+import "cmp/types/v1/date.proto";
+import "cmp/types/v1/document.proto";
 
 // Traveller
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/traveller.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/traveller.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/traveller.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/traveller.proto.dot.svg)
 message BasicTraveller {
   // Guest number, the lowest number is the lead-pax. This ID is also used for
   // referencing services linked to specific participants, like baggage.
@@ -26,10 +26,10 @@ message BasicTraveller {
   TravellerType type = 2;
 
   // Birthdate
-  cmp.types.v1alpha.Date birthdate = 3;
+  cmp.types.v1.Date birthdate = 3;
 
   // The country code for the nationality of the traveller.
-  cmp.types.v1alpha.Country nationality = 4;
+  cmp.types.v1.Country nationality = 4;
 }
 
 // Traveller Type
@@ -64,8 +64,8 @@ message ExtensiveTraveller {
   // into first_name: John, first_name: Roger, surname: Stephens, surname: Legend.
   repeated string first_names = 3;
   repeated string surnames = 4;
-  cmp.types.v1alpha.ContactInfo contact_info = 5;
-  repeated cmp.types.v1alpha.Document documents = 6;
+  cmp.types.v1.ContactInfo contact_info = 5;
+  repeated cmp.types.v1.Document documents = 6;
 }
 
 // Gender Type
diff --git a/proto/cmp/types/v1alpha/uuid.proto b/proto/cmp/types/v1/uuid.proto
similarity index 66%
rename from proto/cmp/types/v1alpha/uuid.proto
rename to proto/cmp/types/v1/uuid.proto
index bb9fccd8..c8a254a7 100644
--- a/proto/cmp/types/v1alpha/uuid.proto
+++ b/proto/cmp/types/v1/uuid.proto
@@ -1,13 +1,13 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // ### UUID message type
 //
 // This must be a UUID according to RFC 4122 standard.
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/uuid.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/uuid.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/uuid.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/uuid.proto.dot.svg)
 message UUID {
   string value = 1;
 }
diff --git a/proto/cmp/types/v1alpha/wallet.proto b/proto/cmp/types/v1/wallet.proto
similarity index 79%
rename from proto/cmp/types/v1alpha/wallet.proto
rename to proto/cmp/types/v1/wallet.proto
index 78aa2a74..f65b72b9 100644
--- a/proto/cmp/types/v1alpha/wallet.proto
+++ b/proto/cmp/types/v1/wallet.proto
@@ -1,11 +1,11 @@
 syntax = "proto3";
 
-package cmp.types.v1alpha;
+package cmp.types.v1;
 
 // Address and public key for a wallet
 //
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/wallet.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/wallet.proto.dot.svg)
+// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/wallet.proto.dot.xs.svg)
+// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1/wallet.proto.dot.svg)
 message WalletAddress {
   // Wallet address
   //
diff --git a/proto/cmp/types/v1alpha/contact_info.proto b/proto/cmp/types/v1alpha/contact_info.proto
deleted file mode 100644
index da61cc68..00000000
--- a/proto/cmp/types/v1alpha/contact_info.proto
+++ /dev/null
@@ -1,26 +0,0 @@
-syntax = "proto3";
-
-package cmp.types.v1alpha;
-
-import "cmp/types/v1alpha/address.proto";
-import "cmp/types/v1alpha/email.proto";
-import "cmp/types/v1alpha/link.proto";
-import "cmp/types/v1alpha/phone.proto";
-
-// Contact Info for general use.
-//
-// ![Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/contact_info.proto.dot.xs.svg)
-// [Open Message Diagram](https://storage.googleapis.com/docs-cmp-files/diagrams/proto/cmp/types/v1alpha/contact_info.proto.dot.svg)
-message ContactInfo {
-  // Address
-  repeated cmp.types.v1alpha.Address address = 1;
-
-  // Phones
-  repeated cmp.types.v1alpha.Phone phones = 2;
-
-  // Emails
-  repeated cmp.types.v1alpha.Email emails = 3;
-
-  // Websites
-  repeated cmp.types.v1alpha.Link links = 4;
-}