You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iggy.apache.org by pi...@apache.org on 2025/06/24 19:49:07 UTC

(iggy) branch fix_iggy_names created (now 151532af)

This is an automated email from the ASF dual-hosted git repository.

piotr pushed a change to branch fix_iggy_names
in repository https://gitbox.apache.org/repos/asf/iggy.git


      at 151532af chore(repo): fix existing Iggy names in whole repo

This branch includes the following new commits:

     new 151532af chore(repo): fix existing Iggy names in whole repo

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



(iggy) 01/01: chore(repo): fix existing Iggy names in whole repo

Posted by pi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

piotr pushed a commit to branch fix_iggy_names
in repository https://gitbox.apache.org/repos/asf/iggy.git

commit 151532afa9acd4d50a14dfd6c6e330eec46aafc0
Author: spetz <pi...@gmail.com>
AuthorDate: Tue Jun 24 21:48:54 2025 +0200

    chore(repo): fix existing Iggy names in whole repo
---
 README.md                                          |  4 +--
 .../dashboard/frontend/src/components/footer.rs    |  6 ++--
 core/bench/dashboard/server/src/github/client.rs   |  2 +-
 foreign/cpp/README.md                              |  4 +--
 foreign/cpp/sdk/binary.h                           |  2 +-
 foreign/cpp/sdk/model.h                            |  4 +--
 foreign/cpp/tests/CMakeLists.txt                   |  4 +--
 foreign/cpp/tests/e2e/e2e_testutils.cc             |  2 +-
 foreign/cpp/tests/e2e/server.toml                  | 12 ++++----
 .../Iggy_SDK_Tests/E2ETests/ConsumerGroupE2E.cs    | 34 +++++++++++-----------
 .../Iggy_SDK_Tests/E2ETests/FetchMessagesE2E.cs    | 20 ++++++-------
 .../Iggy_SDK_Tests/E2ETests/FlushMessagesE2E.cs    | 26 ++++++++---------
 .../csharp/Iggy_SDK_Tests/E2ETests/OffsetE2E.cs    |  8 ++---
 foreign/csharp/Iggy_SDK_Tests/E2ETests/PATE2E.cs   | 26 ++++++++---------
 .../Iggy_SDK_Tests/E2ETests/SendMessagesE2E.cs     | 20 ++++++-------
 foreign/csharp/README.md                           |  7 ++---
 .../go/benchmarks/send_messages_benchmark_test.go  |  4 +--
 .../binary_request_serializer.go                   |  2 +-
 .../binary_response_deserializer.go                |  4 +--
 .../create_stream_serializer.go                    |  2 +-
 .../create_stream_serializer_test.go               |  2 +-
 .../create_topic_serializer.go                     |  2 +-
 .../fetch_messages_request_serializer.go           |  2 +-
 .../fetch_messages_request_serializer_test.go      |  2 +-
 .../binary_serialization/identifier_serializer.go  |  2 +-
 .../identifier_serializer_test.go                  |  2 +-
 .../log_in_request_serializer.go                   |  2 +-
 .../send_messages_request_serializer.go            |  2 +-
 .../send_messages_request_serializer_test.go       |  2 +-
 .../go/binary_serialization/stats_serializer.go    |  2 +-
 .../update_stream_serializer.go                    |  2 +-
 .../update_stream_serializer_test.go               |  2 +-
 .../update_topic_serializer.go                     |  2 +-
 .../update_topic_serializer_test.go                |  2 +-
 foreign/go/cli/cli.go                              |  4 +--
 foreign/go/contracts/messages.go                   |  2 +-
 .../go/e2e/tcp_test/consumers_feature_create.go    |  2 +-
 .../go/e2e/tcp_test/consumers_feature_delete.go    |  4 +--
 .../go/e2e/tcp_test/consumers_feature_get_all.go   |  2 +-
 .../go/e2e/tcp_test/consumers_feature_get_by_id.go |  4 +--
 foreign/go/e2e/tcp_test/consumers_feature_join.go  |  2 +-
 foreign/go/e2e/tcp_test/consumers_feature_leave.go |  2 +-
 foreign/go/e2e/tcp_test/consumers_steps.go         |  4 +--
 foreign/go/e2e/tcp_test/messages_feature_send.go   |  2 +-
 foreign/go/e2e/tcp_test/messages_steps.go          |  4 +--
 .../go/e2e/tcp_test/partitions_feature_create.go   |  2 +-
 .../go/e2e/tcp_test/partitions_feature_delete.go   |  2 +-
 foreign/go/e2e/tcp_test/partitions_steps.go        |  4 +--
 foreign/go/e2e/tcp_test/pat_feature_create.go      |  2 +-
 foreign/go/e2e/tcp_test/pat_feature_delete.go      |  2 +-
 foreign/go/e2e/tcp_test/pat_steps.go               |  4 +--
 foreign/go/e2e/tcp_test/session_feature_login.go   |  2 +-
 foreign/go/e2e/tcp_test/stream_feature_create.go   |  2 +-
 foreign/go/e2e/tcp_test/stream_feature_delete.go   |  2 +-
 .../go/e2e/tcp_test/stream_feature_get_by_id.go    |  2 +-
 foreign/go/e2e/tcp_test/stream_feature_update.go   |  2 +-
 foreign/go/e2e/tcp_test/stream_steps.go            |  6 ++--
 foreign/go/e2e/tcp_test/test_helpers.go            |  4 +--
 foreign/go/e2e/tcp_test/test_shared_steps.go       |  2 +-
 foreign/go/e2e/tcp_test/topic_feature_create.go    |  2 +-
 foreign/go/e2e/tcp_test/topic_feature_delete.go    |  4 +--
 foreign/go/e2e/tcp_test/topic_feature_get_all.go   |  2 +-
 foreign/go/e2e/tcp_test/topic_feature_get_by_id.go |  4 +--
 foreign/go/e2e/tcp_test/topic_feature_update.go    |  2 +-
 foreign/go/e2e/tcp_test/topic_steps.go             |  6 ++--
 foreign/go/e2e/tcp_test/users_feature_create.go    |  2 +-
 foreign/go/e2e/tcp_test/users_feature_delete.go    |  2 +-
 foreign/go/e2e/tcp_test/users_feature_get_by_id.go |  2 +-
 foreign/go/e2e/tcp_test/users_feature_password.go  |  2 +-
 .../go/e2e/tcp_test/users_feature_permissions.go   |  2 +-
 foreign/go/e2e/tcp_test/users_feature_update.go    |  2 +-
 foreign/go/e2e/tcp_test/users_steps.go             |  4 +--
 foreign/go/go.mod                                  |  2 +-
 foreign/go/message_stream.go                       |  2 +-
 foreign/go/message_stream_factory.go               |  4 +--
 foreign/go/samples/README.md                       |  4 +--
 foreign/go/samples/consumer/README.md              |  2 +-
 foreign/go/samples/consumer/consumer.go            |  6 ++--
 foreign/go/samples/producer/README.md              |  2 +-
 foreign/go/samples/producer/message_generator.go   |  2 +-
 foreign/go/samples/producer/producer.go            |  6 ++--
 foreign/go/tcp/tcp_access_token_managament.go      |  4 +--
 foreign/go/tcp/tcp_clients_managament.go           |  4 +--
 foreign/go/tcp/tcp_consumer_group_managament.go    |  6 ++--
 foreign/go/tcp/tcp_core.go                         | 10 +++----
 foreign/go/tcp/tcp_messaging.go                    |  6 ++--
 foreign/go/tcp/tcp_offset_managament.go            |  4 +--
 foreign/go/tcp/tcp_partition_managament.go         |  4 +--
 foreign/go/tcp/tcp_session_managament.go           |  4 +--
 foreign/go/tcp/tcp_stream_managament.go            |  6 ++--
 foreign/go/tcp/tcp_topic_managament.go             |  6 ++--
 foreign/go/tcp/tcp_user_managament.go              |  6 ++--
 foreign/go/tcp/tcp_utilities.go                    |  4 +--
 foreign/node/README.md                             |  4 +--
 foreign/node/docker-compose.yml                    |  2 +-
 foreign/node/package.json                          |  3 +-
 foreign/python/.devcontainer/docker-compose.yml    |  2 +-
 foreign/python/Cargo.toml                          |  2 +-
 foreign/python/README.md                           |  2 +-
 foreign/python/pyproject.toml                      | 10 +++----
 web/README.md                                      |  8 ++---
 101 files changed, 223 insertions(+), 231 deletions(-)

diff --git a/README.md b/README.md
index cda6f5d8..9b3d72a2 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 
   [![crates.io](https://img.shields.io/crates/v/iggy.svg)](https://crates.io/crates/iggy)
   [![crates.io](https://img.shields.io/crates/d/iggy.svg)](https://crates.io/crates/iggy)
-  [![coverage](https://coveralls.io/repos/github/iggy-rs/iggy/badge.svg?branch=master)](https://coveralls.io/github/iggy-rs/iggy?branch=master)
+  [![coverage](https://coveralls.io/repos/github/apache/iggy/badge.svg?branch=master)](https://coveralls.io/github/apache/iggy?branch=master)
   [![dependency](https://deps.rs/repo/github/apache/iggy/status.svg)](https://deps.rs/repo/github/apache/iggy)
   [![x](https://img.shields.io/twitter/follow/ApacheIggy?style=social)](https://twitter.com/ApacheIggy)
   [![discord-badge](https://img.shields.io/discord/1144142576266530928)](https://discord.gg/C5Sux5NcRa)
@@ -113,8 +113,6 @@ The recent improvements based on the zero-copy (de)serialization, along with upd
 - C++
 - Elixir
 
-Almost all the tooling has been migrated from [iggy-rs](https://github.com/iggy-rs/) organization to this monorepo. There's no an ongoing work to support the zero-copy (de)serialization for all the SDKs.
-
 ---
 
 ## CLI
diff --git a/core/bench/dashboard/frontend/src/components/footer.rs b/core/bench/dashboard/frontend/src/components/footer.rs
index 06256a01..ab5b55ab 100644
--- a/core/bench/dashboard/frontend/src/components/footer.rs
+++ b/core/bench/dashboard/frontend/src/components/footer.rs
@@ -22,11 +22,11 @@ pub fn footer() -> Html {
     html! {
         <footer class="footer">
             <div class="footer-content">
-                <a href="https://iggy.rs" target="_blank" rel="noopener noreferrer">
-                    {"iggy.rs"}
+                <a href="https://iggy.apache.org" target="_blank" rel="noopener noreferrer">
+                    {"iggy.apache.org"}
                 </a>
                 <span class="separator">{"|"}</span>
-                <a href="https://github.com/iggy-rs" target="_blank" rel="noopener noreferrer">
+                <a href="https://github.com/apache/iggy" target="_blank" rel="noopener noreferrer">
                     {"GitHub"}
                 </a>
                 <span class="separator">{"|"}</span>
diff --git a/core/bench/dashboard/server/src/github/client.rs b/core/bench/dashboard/server/src/github/client.rs
index 965493f0..21f5ce18 100644
--- a/core/bench/dashboard/server/src/github/client.rs
+++ b/core/bench/dashboard/server/src/github/client.rs
@@ -31,7 +31,7 @@ use tokio::fs::read_dir;
 use tracing::{info, trace};
 use zip::ZipArchive;
 
-const OWNER: &str = "iggy-rs";
+const OWNER: &str = "apache";
 const REPO: &str = "iggy";
 const WORKFLOW_FILE: &str = "performance.yml";
 
diff --git a/foreign/cpp/README.md b/foreign/cpp/README.md
index 5b470125..bbe54cf3 100644
--- a/foreign/cpp/README.md
+++ b/foreign/cpp/README.md
@@ -1,5 +1,3 @@
 # Iggy C++ Client
 
-[![CI](https://github.com/iggy-rs/iggy-cpp-client/actions/workflows/ci.yml/badge.svg)](https://github.com/marketplace/actions/super-linter) [![Test Coverage](https://coveralls.io/repos/github/iggy-rs/iggy-cpp-client/badge.svg?branch=main)](https://coveralls.io/github/iggy-rs/iggy-cpp-client?branch=main)
-
-This project aims to create a full C++ client for [Iggy.rs](https://iggy.rs).
+This project aims to create a full C++ client for [Apache Iggy](https://iggy.apache.org).
diff --git a/foreign/cpp/sdk/binary.h b/foreign/cpp/sdk/binary.h
index ceedf700..438d8d5b 100644
--- a/foreign/cpp/sdk/binary.h
+++ b/foreign/cpp/sdk/binary.h
@@ -24,7 +24,7 @@ namespace serialization {
  * @namespace binary
  * @brief All related types for the binary format used in Iggy's TCP and QUIC transports.
  *
- * The definitions \htmlonly <a href="https://docs.iggy.rs/specification/binary">binary specification</a> \endhtmlonly
+ * The definitions \htmlonly <a href="https://iggy.apache.org/docs/server/schema">binary specification</a> \endhtmlonly
  * which should be taken as canonical; E2E conformance tests will be used to ensure client stays in line. I am not sure
  * about this design yet; ideally I want minimal duplication between the binary and JSON variations, and so may
  * introduce format-specific serializers. This is less natural in C++ than Rust.
diff --git a/foreign/cpp/sdk/model.h b/foreign/cpp/sdk/model.h
index 541895bd..8bd9ad7b 100644
--- a/foreign/cpp/sdk/model.h
+++ b/foreign/cpp/sdk/model.h
@@ -539,8 +539,8 @@ public:
  * This class is used to represent the result of the GetStats call,
  * which gets a snapshot of latest server performance statistics.
  *
- * @see [GetStats definition](https://docs.iggy.rs/specification/binary#get-stats)
- * @see [stats.rs](https://github.com/iggy-rs/iggy/blob/master/iggy/src/models/stats.rs)
+ * @see [GetStats definition](https://iggy.apache.org/docs/server/schema#get-stats)
+ * @see [stats.rs](https://github.com/apache/iggy/blob/master/core/server/src/streaming/systems/stats.rs)
  */
 class Stats : Model {
 private:
diff --git a/foreign/cpp/tests/CMakeLists.txt b/foreign/cpp/tests/CMakeLists.txt
index 85484a91..4d362ee2 100644
--- a/foreign/cpp/tests/CMakeLists.txt
+++ b/foreign/cpp/tests/CMakeLists.txt
@@ -76,13 +76,13 @@ if(BUILD_TESTS)
   # we are going to use these directly for E2E testing rather than the Docker version
   # to allow for finer-grained control
   execute_process(
-    COMMAND bash -c "curl --silent https://api.github.com/repos/iggy-rs/iggy/releases/latest | jq -r .tag_name"
+    COMMAND bash -c "curl --silent https://api.github.com/repos/apache/iggy/releases/latest | jq -r .tag_name"
     OUTPUT_VARIABLE IGGY_VERSION
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
   set(ARCH "${CMAKE_HOST_SYSTEM_PROCESSOR}")
   set(IGGY_DOWNLOAD_BASENAME "iggy-Linux-${ARCH}-musl.zip")
-  set(URL "https://github.com/iggy-rs/iggy/releases/download/${IGGY_VERSION}/${IGGY_DOWNLOAD_BASENAME}")
+  set(URL "https://github.com/apache/iggy/releases/download/${IGGY_VERSION}/${IGGY_DOWNLOAD_BASENAME}")
   set(IGGY_DOWNLOAD_FILE "${CMAKE_CURRENT_BINARY_DIR}/${IGGY_DOWNLOAD_BASENAME}")
   message(STATUS "Downloading latest Iggy server MUSL release build from ${URL}")
 
diff --git a/foreign/cpp/tests/e2e/e2e_testutils.cc b/foreign/cpp/tests/e2e/e2e_testutils.cc
index ab5fc431..414c1dab 100644
--- a/foreign/cpp/tests/e2e/e2e_testutils.cc
+++ b/foreign/cpp/tests/e2e/e2e_testutils.cc
@@ -23,7 +23,7 @@
 
 IggyRunner::IggyRunner() {
     // start the Docker process with stdout redirected to parent process
-    std::vector<std::string> arguments = {"docker", "run", "-d", "--name", "iggy_test", "iggyrs/iggy:latest"};
+    std::vector<std::string> arguments = {"docker", "run", "-d", "--name", "iggy_test", "apache/iggy:latest"};
     reproc::options options;
     options.redirect.parent = true;
     auto err = process.start(arguments, options);
diff --git a/foreign/cpp/tests/e2e/server.toml b/foreign/cpp/tests/e2e/server.toml
index 9be27112..cc8242dd 100644
--- a/foreign/cpp/tests/e2e/server.toml
+++ b/foreign/cpp/tests/e2e/server.toml
@@ -52,16 +52,16 @@ allow_private_network = false
 algorithm = "HS256"
 
 # The issuer of the JWT, typically a URL or an identifier of the issuing entity.
-issuer = "iggy.rs"
+issuer = "iggy.apache.org"
 
 # Intended audience for the JWT, usually the recipient or system intended to process the token.
-audience = "iggy.rs"
+audience = "iggy.apache.org"
 
 # Lists valid issuers for JWT validation to ensure tokens are from trusted sources.
-valid_issuers = ["iggy.rs"]
+valid_issuers = ["iggy.apache.org"]
 
 # Lists valid audiences for JWT validation to confirm tokens are for the intended recipient.
-valid_audiences = ["iggy.rs"]
+valid_audiences = ["iggy.apache.org"]
 
 # Expiry time for access tokens.
 access_token_expiry = "1 h"
@@ -76,10 +76,10 @@ clock_skew = "5 s"
 not_before = "0 s"
 
 # Secret key for encoding JWTs.
-encoding_secret = "top_secret$iggy.rs$_jwt_HS256_key#!"
+encoding_secret = "top_secret$iggy.apache.org$_jwt_HS256_key#!"
 
 # Secret key for decoding JWTs.
-decoding_secret = "top_secret$iggy.rs$_jwt_HS256_key#!"
+decoding_secret = "top_secret$iggy.apache.org$_jwt_HS256_key#!"
 
 # Indicates if the secret key is base64 encoded.
 # `true` means the secret is base64 encoded.
diff --git a/foreign/csharp/Iggy_SDK_Tests/E2ETests/ConsumerGroupE2E.cs b/foreign/csharp/Iggy_SDK_Tests/E2ETests/ConsumerGroupE2E.cs
index da58c808..4f6bb240 100644
--- a/foreign/csharp/Iggy_SDK_Tests/E2ETests/ConsumerGroupE2E.cs
+++ b/foreign/csharp/Iggy_SDK_Tests/E2ETests/ConsumerGroupE2E.cs
@@ -28,12 +28,12 @@ namespace Apache.Iggy.Tests.E2ETests;
 [TestCaseOrderer("Apache.Iggy.Tests.Utils.PriorityOrderer", "Apache.Iggy.Tests")]
 public sealed class ConsumerGroupE2E : IClassFixture<IggyConsumerGroupFixture>
 {
-    private const string SkipMessage = "TCP implementation needs to be aligned with Iggyrs core changes";
-    
+    private const string SkipMessage = "TCP implementation needs to be aligned with Iggy core changes";
+
     private readonly IggyConsumerGroupFixture _fixture;
 
     private const int GROUP_ID = 1;
-    
+
     private static readonly CreateConsumerGroupRequest _createConsumerGroupRequest =
         ConsumerGroupFactory.CreateRequest(
             (int)ConsumerGroupFixtureBootstrap.StreamRequest.StreamId!,
@@ -53,7 +53,7 @@ public sealed class ConsumerGroupE2E : IClassFixture<IggyConsumerGroupFixture>
         ConsumerGroupFactory.CreateDeleteGroupRequest(
             (int)ConsumerGroupFixtureBootstrap.StreamRequest.StreamId,
             (int)ConsumerGroupFixtureBootstrap.TopicRequest.TopicId, GROUP_ID);
-    
+
     private Identifier ConsumerGroupId = Identifier.Numeric(GROUP_ID);
 
     public ConsumerGroupE2E(IggyConsumerGroupFixture fixture)
@@ -74,7 +74,7 @@ public sealed class ConsumerGroupE2E : IClassFixture<IggyConsumerGroupFixture>
             consumerGroup.MembersCount.Should().Be(0);
             consumerGroup.Name.Should().Be(_createConsumerGroupRequest.Name);
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
 
@@ -88,10 +88,10 @@ public sealed class ConsumerGroupE2E : IClassFixture<IggyConsumerGroupFixture>
                 .Should()
                 .ThrowExactlyAsync<InvalidResponseException>();
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-    
+
     [Fact, TestPriority(3)]
     public async Task GetConsumerGroupById_Should_Return_ValidResponse()
     {
@@ -101,16 +101,16 @@ public sealed class ConsumerGroupE2E : IClassFixture<IggyConsumerGroupFixture>
             var response = await sut.Client.GetConsumerGroupByIdAsync(
                 Identifier.Numeric((int)ConsumerGroupFixtureBootstrap.StreamRequest.StreamId!), Identifier.Numeric((int)ConsumerGroupFixtureBootstrap.TopicRequest.TopicId!),
                 ConsumerGroupId);
-        
+
             response.Should().NotBeNull();
             response!.Id.Should().Be(GROUP_ID);
             response.PartitionsCount.Should().Be(ConsumerGroupFixtureBootstrap.TopicRequest.PartitionsCount);
             response.MembersCount.Should().Be(0);
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-    
+
     [Fact, TestPriority(4)]
     public async Task GetConsumerGroups_Should_Return_ValidResponse()
     {
@@ -119,7 +119,7 @@ public sealed class ConsumerGroupE2E : IClassFixture<IggyConsumerGroupFixture>
         {
             var response = await sut.Client.GetConsumerGroupsAsync(
                 Identifier.Numeric((int)ConsumerGroupFixtureBootstrap.StreamRequest.StreamId!), Identifier.Numeric((int)ConsumerGroupFixtureBootstrap.TopicRequest.TopicId!));
-        
+
             response.Should().NotBeNull();
             response.Count.Should().Be(1);
             var group = response.FirstOrDefault();
@@ -127,10 +127,10 @@ public sealed class ConsumerGroupE2E : IClassFixture<IggyConsumerGroupFixture>
             group.PartitionsCount.Should().Be(ConsumerGroupFixtureBootstrap.TopicRequest.PartitionsCount);
             group.MembersCount.Should().Be(0);
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-    
+
     [Fact, TestPriority(5)]
     public async Task JoinConsumerGroup_Should_JoinConsumerGroup_Successfully()
     {
@@ -139,7 +139,7 @@ public sealed class ConsumerGroupE2E : IClassFixture<IggyConsumerGroupFixture>
                 y.JoinConsumerGroupAsync(_joinConsumerGroupRequest)
             ).Should()
             .ThrowExactlyAsync<FeatureUnavailableException>();
-        
+
         await _fixture.TcpClient.Client.Invoking(x => x.JoinConsumerGroupAsync(_joinConsumerGroupRequest))
             .Should()
             .NotThrowAsync();
@@ -177,7 +177,7 @@ public sealed class ConsumerGroupE2E : IClassFixture<IggyConsumerGroupFixture>
         await _fixture.HttpClient.Client.Invoking(x => x.LeaveConsumerGroupAsync(_leaveConsumerGroupRequest))
             .Should()
             .ThrowAsync<FeatureUnavailableException>();
-        
+
         await _fixture.TcpClient.Client.Invoking(x => x.JoinConsumerGroupAsync(_joinConsumerGroupRequest))
             .Should()
             .ThrowExactlyAsync<InvalidResponseException>();
@@ -193,7 +193,7 @@ public sealed class ConsumerGroupE2E : IClassFixture<IggyConsumerGroupFixture>
                 .Should()
                 .ThrowExactlyAsync<InvalidResponseException>();
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-}
\ No newline at end of file
+}
diff --git a/foreign/csharp/Iggy_SDK_Tests/E2ETests/FetchMessagesE2E.cs b/foreign/csharp/Iggy_SDK_Tests/E2ETests/FetchMessagesE2E.cs
index 4320ba59..5061b775 100644
--- a/foreign/csharp/Iggy_SDK_Tests/E2ETests/FetchMessagesE2E.cs
+++ b/foreign/csharp/Iggy_SDK_Tests/E2ETests/FetchMessagesE2E.cs
@@ -28,7 +28,7 @@ namespace Apache.Iggy.Tests.E2ETests;
 [TestCaseOrderer("Apache.Iggy.Tests.Utils.PriorityOrderer", "Apache.Iggy.Tests")]
 public sealed class FetchMessagesE2E : IClassFixture<IggyFetchMessagesFixture>
 {
-    private const string SkipMessage = "TCP implementation needs to be aligned with Iggyrs core changes";
+    private const string SkipMessage = "TCP implementation needs to be aligned with Iggy core changes";
     private readonly IggyFetchMessagesFixture _fixture;
 
     private static readonly MessageFetchRequest _messageFetchRequest =
@@ -46,7 +46,7 @@ public sealed class FetchMessagesE2E : IClassFixture<IggyFetchMessagesFixture>
     {
         _fixture = fixture;
     }
-    
+
     [Fact, TestPriority(1)]
     public async Task PollMessagesTMessage_WithNoHeaders_Should_PollMessages_Successfully()
     {
@@ -63,10 +63,10 @@ public sealed class FetchMessagesE2E : IClassFixture<IggyFetchMessagesFixture>
                 responseMessage.Message.Text.Should().NotBeNullOrEmpty();
             }
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-    
+
     [Fact, TestPriority(2)]
     public async Task PollMessagesTMessage_Should_Throw_InvalidResponse()
     {
@@ -77,7 +77,7 @@ public sealed class FetchMessagesE2E : IClassFixture<IggyFetchMessagesFixture>
                 .Should()
                 .ThrowExactlyAsync<InvalidResponseException>();
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
 
@@ -98,7 +98,7 @@ public sealed class FetchMessagesE2E : IClassFixture<IggyFetchMessagesFixture>
                 responseMessage.Payload.Length.Should().BeGreaterThan(0);
             }
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
 
@@ -112,7 +112,7 @@ public sealed class FetchMessagesE2E : IClassFixture<IggyFetchMessagesFixture>
                 .Should()
                 .ThrowExactlyAsync<InvalidResponseException>();
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
 
@@ -132,7 +132,7 @@ public sealed class FetchMessagesE2E : IClassFixture<IggyFetchMessagesFixture>
                 responseMessage.UserHeaders!.Count.Should().Be(3);
             }
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
 
@@ -152,7 +152,7 @@ public sealed class FetchMessagesE2E : IClassFixture<IggyFetchMessagesFixture>
                 responseMessage.UserHeaders!.Count.Should().Be(3);
             }
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-}
\ No newline at end of file
+}
diff --git a/foreign/csharp/Iggy_SDK_Tests/E2ETests/FlushMessagesE2E.cs b/foreign/csharp/Iggy_SDK_Tests/E2ETests/FlushMessagesE2E.cs
index befa925b..daafe1a2 100644
--- a/foreign/csharp/Iggy_SDK_Tests/E2ETests/FlushMessagesE2E.cs
+++ b/foreign/csharp/Iggy_SDK_Tests/E2ETests/FlushMessagesE2E.cs
@@ -27,7 +27,7 @@ namespace Apache.Iggy.Tests.E2ETests;
 [TestCaseOrderer("Apache.Iggy.Tests.Utils.PriorityOrderer", "Apache.Iggy.Tests")]
 public sealed class FlushMessagesE2E : IClassFixture<IggyFlushMessagesFixture>
 {
-    private const string SkipMessage = "TCP implementation needs to be aligned with Iggyrs core changes";
+    private const string SkipMessage = "TCP implementation needs to be aligned with Iggy core changes";
     private readonly IggyFlushMessagesFixture _fixture;
 
     private static readonly FlushUnsavedBufferRequest _flushRequestFsync = new()
@@ -37,7 +37,7 @@ public sealed class FlushMessagesE2E : IClassFixture<IggyFlushMessagesFixture>
         PartitionId = FlushMessagesFixtureBootstrap.PartitionId,
         Fsync = true
     };
-      
+
     private static readonly FlushUnsavedBufferRequest _flushRequest = new()
     {
         StreamId = Identifier.Numeric(FlushMessagesFixtureBootstrap.StreamId),
@@ -45,7 +45,7 @@ public sealed class FlushMessagesE2E : IClassFixture<IggyFlushMessagesFixture>
         PartitionId = FlushMessagesFixtureBootstrap.PartitionId,
         Fsync = false
     };
-    
+
     private static readonly FlushUnsavedBufferRequest _flushInvalidStreamRequest = new()
     {
         StreamId = Identifier.Numeric(FlushMessagesFixtureBootstrap.InvalidStreamId),
@@ -53,13 +53,13 @@ public sealed class FlushMessagesE2E : IClassFixture<IggyFlushMessagesFixture>
         PartitionId = FlushMessagesFixtureBootstrap.PartitionId,
         Fsync = false
     };
-    
+
 
     public FlushMessagesE2E(IggyFlushMessagesFixture fixture)
     {
         _fixture = fixture;
     }
-    
+
     [Fact, TestPriority(1)]
     public async Task FlushUnsavedBuffer_WithFsync_Should_Flush_Successfully()
     {
@@ -70,10 +70,10 @@ public sealed class FlushMessagesE2E : IClassFixture<IggyFlushMessagesFixture>
                 .Should()
                 .NotThrowAsync();
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-    
+
     [Fact, TestPriority(2)]
     public async Task FlushUnsavedBuffer_WithOutFsync_Should_Flush_Successfully()
     {
@@ -83,12 +83,12 @@ public sealed class FlushMessagesE2E : IClassFixture<IggyFlushMessagesFixture>
             await sut.Invoking(x => x.Client.FlushUnsavedBufferAsync(_flushRequest))
                 .Should()
                 .NotThrowAsync();
-            
+
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-    
+
     [Fact, TestPriority(3)]
     public async Task FlushUnsavedBuffer_Should_Throw_WhenStream_DoesNotExist()
     {
@@ -98,9 +98,9 @@ public sealed class FlushMessagesE2E : IClassFixture<IggyFlushMessagesFixture>
             await sut.Invoking(x => x.Client.FlushUnsavedBufferAsync(_flushInvalidStreamRequest))
                 .Should()
                 .ThrowAsync<InvalidResponseException>();
-            
+
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-}
\ No newline at end of file
+}
diff --git a/foreign/csharp/Iggy_SDK_Tests/E2ETests/OffsetE2E.cs b/foreign/csharp/Iggy_SDK_Tests/E2ETests/OffsetE2E.cs
index 45f14ad7..d8b8abd6 100644
--- a/foreign/csharp/Iggy_SDK_Tests/E2ETests/OffsetE2E.cs
+++ b/foreign/csharp/Iggy_SDK_Tests/E2ETests/OffsetE2E.cs
@@ -27,7 +27,7 @@ namespace Apache.Iggy.Tests.E2ETests;
 [TestCaseOrderer("Apache.Iggy.Tests.Utils.PriorityOrderer", "Apache.Iggy.Tests")]
 public sealed class OffsetE2E : IClassFixture<IggyOffsetFixture>
 {
-    private const string SkipMessage = "TCP implementation needs to be aligned with Iggyrs core changes";
+    private const string SkipMessage = "TCP implementation needs to be aligned with Iggy core changes";
     private readonly IggyOffsetFixture _fixture;
     private readonly StoreOffsetRequest _storeOffsetIndividualConsumer;
     private readonly OffsetRequest _offsetIndividualConsumer;
@@ -56,7 +56,7 @@ public sealed class OffsetE2E : IClassFixture<IggyOffsetFixture>
                 .Should()
                 .NotThrowAsync();
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
 
@@ -70,7 +70,7 @@ public sealed class OffsetE2E : IClassFixture<IggyOffsetFixture>
             offset.Should().NotBeNull();
             offset!.StoredOffset.Should().Be(_storeOffsetIndividualConsumer.Offset);
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-}
\ No newline at end of file
+}
diff --git a/foreign/csharp/Iggy_SDK_Tests/E2ETests/PATE2E.cs b/foreign/csharp/Iggy_SDK_Tests/E2ETests/PATE2E.cs
index e4acb590..fe8520a0 100644
--- a/foreign/csharp/Iggy_SDK_Tests/E2ETests/PATE2E.cs
+++ b/foreign/csharp/Iggy_SDK_Tests/E2ETests/PATE2E.cs
@@ -29,14 +29,14 @@ namespace Apache.Iggy.Tests.E2ETests;
 [TestCaseOrderer("Apache.Iggy.Tests.Utils.PriorityOrderer", "Apache.Iggy.Tests")]
 public sealed class PATE2E : IClassFixture<IggyPATFixture>
 {
-    private const string SkipMessage = "TCP implementation needs to be aligned with Iggyrs core changes";
+    private const string SkipMessage = "TCP implementation needs to be aligned with Iggy core changes";
     private readonly IggyPATFixture _fixture;
-    
+
     public PATE2E(IggyPATFixture fixture)
     {
         _fixture = fixture;
     }
-    
+
     [Fact, TestPriority(1)]
     public async Task CreatePersonalAccessToken_HappyPath_Should_CreatePersonalAccessToken_Successfully()
     {
@@ -47,10 +47,10 @@ public sealed class PATE2E : IClassFixture<IggyPATFixture>
                 .Should()
                 .NotThrowAsync();
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-    
+
     [Fact, TestPriority(2)]
     public async Task CreatePersonalAccessToken_Duplicate_Should_Throw_InvalidResponse()
     {
@@ -61,10 +61,10 @@ public sealed class PATE2E : IClassFixture<IggyPATFixture>
                 .Should()
                 .ThrowExactlyAsync<InvalidResponseException>();
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-    
+
     [Fact, TestPriority(3)]
     public async Task GetPersonalAccessTokens_Should_ReturnValidResponse()
     {
@@ -78,10 +78,10 @@ public sealed class PATE2E : IClassFixture<IggyPATFixture>
             var tokenExpiryDateTimeOffset = DateTime.UtcNow.AddMicroseconds((double)PATFixtureBootstrap.CreatePersonalAccessTokenRequest.Expiry!).ToDateTimeOffset();
             response[0].ExpiryAt!.Value.Date.Should().Be(tokenExpiryDateTimeOffset.LocalDateTime.Date);
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-    
+
     [Fact, TestPriority(4)]
     public async Task LoginWithPersonalAccessToken_Should_Be_Successfull()
     {
@@ -99,10 +99,10 @@ public sealed class PATE2E : IClassFixture<IggyPATFixture>
                 Token = response!.Token
             })).Should().NotThrowAsync();
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-    
+
     [Fact, TestPriority(5)]
     public async Task DeletePersonalAccessToken_Should_DeletePersonalAccessToken_Successfully()
     {
@@ -116,7 +116,7 @@ public sealed class PATE2E : IClassFixture<IggyPATFixture>
             .Should()
             .NotThrowAsync();
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-}
\ No newline at end of file
+}
diff --git a/foreign/csharp/Iggy_SDK_Tests/E2ETests/SendMessagesE2E.cs b/foreign/csharp/Iggy_SDK_Tests/E2ETests/SendMessagesE2E.cs
index 66af2ec7..3ecfe3e0 100644
--- a/foreign/csharp/Iggy_SDK_Tests/E2ETests/SendMessagesE2E.cs
+++ b/foreign/csharp/Iggy_SDK_Tests/E2ETests/SendMessagesE2E.cs
@@ -28,7 +28,7 @@ namespace Apache.Iggy.Tests.E2ETests;
 [TestCaseOrderer("Apache.Iggy.Tests.Utils.PriorityOrderer", "Apache.Iggy.Tests")]
 public sealed class SendMessagesE2E : IClassFixture<IggySendMessagesFixture>
 {
-    private const string SkipMessage = "TCP implementation needs to be aligned with Iggyrs core changes";
+    private const string SkipMessage = "TCP implementation needs to be aligned with Iggy core changes";
     private readonly IggySendMessagesFixture _fixture;
 
     private readonly MessageSendRequest _messageNoHeadersSendRequest;
@@ -55,7 +55,7 @@ public sealed class SendMessagesE2E : IClassFixture<IggySendMessagesFixture>
         _invalidMessageWithHeadersSendRequest = MessageFactory.CreateMessageSendRequest(SendMessagesFixtureBootstrap.InvalidStreamId,
             SendMessagesFixtureBootstrap.InvalidTopicId, SendMessagesFixtureBootstrap.PartitionId, messageWithHeaders);
     }
-    
+
     [Fact, TestPriority(1)]
     public async Task SendMessages_NoHeaders_Should_SendMessages_Successfully()
     {
@@ -66,10 +66,10 @@ public sealed class SendMessagesE2E : IClassFixture<IggySendMessagesFixture>
                 .Should()
                 .NotThrowAsync();
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-    
+
     [Fact, TestPriority(2)]
     public async Task SendMessages_NoHeaders_Should_Throw_InvalidResponse()
     {
@@ -80,10 +80,10 @@ public sealed class SendMessagesE2E : IClassFixture<IggySendMessagesFixture>
                 .Should()
                 .ThrowAsync<InvalidResponseException>();
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-    
+
     [Fact, TestPriority(3)]
     public async Task SendMessages_WithHeaders_Should_SendMessages_Successfully()
     {
@@ -94,10 +94,10 @@ public sealed class SendMessagesE2E : IClassFixture<IggySendMessagesFixture>
                 .Should()
                 .NotThrowAsync();
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-    
+
     [Fact, TestPriority(4)]
     public async Task SendMessages_WithHeaders_Should_Throw_InvalidResponse()
     {
@@ -108,7 +108,7 @@ public sealed class SendMessagesE2E : IClassFixture<IggySendMessagesFixture>
                 .Should()
                 .ThrowAsync<InvalidResponseException>();
         })).ToArray();
-        
+
         await Task.WhenAll(tasks);
     }
-}
\ No newline at end of file
+}
diff --git a/foreign/csharp/README.md b/foreign/csharp/README.md
index fc8a6bc1..af1dfac1 100644
--- a/foreign/csharp/README.md
+++ b/foreign/csharp/README.md
@@ -2,7 +2,6 @@
 
 <div align="center">
 
-[![.NET](https://github.com/iggy-rs/iggy-dotnet-client/actions/workflows/dotnet.yml/badge.svg)](https://github.com/iggy-rs/iggy-dotnet-client/actions/workflows/dotnet.yml)
 [![Nuget (with prereleases)](https://img.shields.io/nuget/vpre/Iggy)](https://www.nuget.org/packages/Iggy)
 
 </div>
@@ -374,13 +373,11 @@ If you register `IIggyClient` in a dependency injection container, you will have
 that encapsulate smaller parts of the system `IIggyStream` `IIggyTopic` `IIggyPublisher` `IIggyConsumer` `IIggyConsumerGroup` `IIggyOffset`
 `IIggyPartition` `IIggyUsers` `IIggyUtils`
 
-For more information about how Iggy works check its [documentation](https://docs.iggy.rs/)
+For more information about how Iggy works check its [documentation](https://iggy.apache.org/docs/)
 
 ## Producer / Consumer Sample
 
-<https://github.com/iggy-rs/iggy-dotnet-client/assets/112548209/3a89d2f5-d066-40d2-8b82-96c3e338007e>
-
-To run the samples, first get [Iggy](https://github.com/spetz/iggy), Run the server with `cargo run --bin iggy-server`, then get the SDK, cd into `Iggy_SDK`
+To run the samples, first get [Iggy](https://github.com/apache/iggy), Run the server with `cargo run --bin iggy-server`, then get the SDK, cd into `Iggy_SDK`
 and run following commands: `dotnet run -c Release --project Iggy_Sample_Producer` for producer, `dotnet run -c Release --project Iggy_Sample_Consumer`
 for consumer.
 
diff --git a/foreign/go/benchmarks/send_messages_benchmark_test.go b/foreign/go/benchmarks/send_messages_benchmark_test.go
index a8946be5..777015c9 100644
--- a/foreign/go/benchmarks/send_messages_benchmark_test.go
+++ b/foreign/go/benchmarks/send_messages_benchmark_test.go
@@ -25,8 +25,8 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/iggy-rs/iggy-go-client"
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	"github.com/apache/iggy"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 )
 
 const (
diff --git a/foreign/go/binary_serialization/binary_request_serializer.go b/foreign/go/binary_serialization/binary_request_serializer.go
index 318f7c39..4cdd9220 100644
--- a/foreign/go/binary_serialization/binary_request_serializer.go
+++ b/foreign/go/binary_serialization/binary_request_serializer.go
@@ -20,7 +20,7 @@ package binaryserialization
 import (
 	"encoding/binary"
 
-	. "github.com/iggy-rs/iggy-go-client/contracts"
+	. "github.com/apache/iggy/foreign/go/contracts"
 )
 
 func CreateGroup(request CreateConsumerGroupRequest) []byte {
diff --git a/foreign/go/binary_serialization/binary_response_deserializer.go b/foreign/go/binary_serialization/binary_response_deserializer.go
index c4cd5324..8f9f29a1 100644
--- a/foreign/go/binary_serialization/binary_response_deserializer.go
+++ b/foreign/go/binary_serialization/binary_response_deserializer.go
@@ -23,8 +23,8 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/iggy-rs/iggy-go-client/contracts"
-	ierror "github.com/iggy-rs/iggy-go-client/errors"
+	. "github.com/apache/iggy/foreign/go/contracts"
+	ierror "github.com/apache/iggy/errors"
 	"github.com/klauspost/compress/s2"
 )
 
diff --git a/foreign/go/binary_serialization/create_stream_serializer.go b/foreign/go/binary_serialization/create_stream_serializer.go
index d32cdfbd..002d669f 100644
--- a/foreign/go/binary_serialization/create_stream_serializer.go
+++ b/foreign/go/binary_serialization/create_stream_serializer.go
@@ -20,7 +20,7 @@ package binaryserialization
 import (
 	"encoding/binary"
 
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 )
 
 type TcpCreateStreamRequest struct {
diff --git a/foreign/go/binary_serialization/create_stream_serializer_test.go b/foreign/go/binary_serialization/create_stream_serializer_test.go
index ac078e5b..81d85db3 100644
--- a/foreign/go/binary_serialization/create_stream_serializer_test.go
+++ b/foreign/go/binary_serialization/create_stream_serializer_test.go
@@ -19,7 +19,7 @@ package binaryserialization
 
 import (
 	"encoding/binary"
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	"reflect"
 	"testing"
 )
diff --git a/foreign/go/binary_serialization/create_topic_serializer.go b/foreign/go/binary_serialization/create_topic_serializer.go
index 8ebca623..ef2d101a 100644
--- a/foreign/go/binary_serialization/create_topic_serializer.go
+++ b/foreign/go/binary_serialization/create_topic_serializer.go
@@ -20,7 +20,7 @@ package binaryserialization
 import (
 	"encoding/binary"
 
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 )
 
 type TcpCreateTopicRequest struct {
diff --git a/foreign/go/binary_serialization/fetch_messages_request_serializer.go b/foreign/go/binary_serialization/fetch_messages_request_serializer.go
index 9630432e..01e0616f 100644
--- a/foreign/go/binary_serialization/fetch_messages_request_serializer.go
+++ b/foreign/go/binary_serialization/fetch_messages_request_serializer.go
@@ -20,7 +20,7 @@ package binaryserialization
 import (
 	"encoding/binary"
 
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 )
 
 const (
diff --git a/foreign/go/binary_serialization/fetch_messages_request_serializer_test.go b/foreign/go/binary_serialization/fetch_messages_request_serializer_test.go
index 3d20f4b1..5ce5b8ce 100644
--- a/foreign/go/binary_serialization/fetch_messages_request_serializer_test.go
+++ b/foreign/go/binary_serialization/fetch_messages_request_serializer_test.go
@@ -20,7 +20,7 @@ package binaryserialization
 import (
 	"testing"
 
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 )
 
 func TestSerialize_TcpFetchMessagesRequest(t *testing.T) {
diff --git a/foreign/go/binary_serialization/identifier_serializer.go b/foreign/go/binary_serialization/identifier_serializer.go
index 96544692..33c8259b 100644
--- a/foreign/go/binary_serialization/identifier_serializer.go
+++ b/foreign/go/binary_serialization/identifier_serializer.go
@@ -20,7 +20,7 @@ package binaryserialization
 import (
 	"encoding/binary"
 
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 )
 
 const (
diff --git a/foreign/go/binary_serialization/identifier_serializer_test.go b/foreign/go/binary_serialization/identifier_serializer_test.go
index 7a9d5801..dc207223 100644
--- a/foreign/go/binary_serialization/identifier_serializer_test.go
+++ b/foreign/go/binary_serialization/identifier_serializer_test.go
@@ -20,7 +20,7 @@ package binaryserialization
 import (
 	"testing"
 
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 )
 
 func TestSerializeIdentifier_StringId(t *testing.T) {
diff --git a/foreign/go/binary_serialization/log_in_request_serializer.go b/foreign/go/binary_serialization/log_in_request_serializer.go
index 591a0f16..68ed4311 100644
--- a/foreign/go/binary_serialization/log_in_request_serializer.go
+++ b/foreign/go/binary_serialization/log_in_request_serializer.go
@@ -20,7 +20,7 @@ package binaryserialization
 import (
 	"encoding/binary"
 
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 )
 
 type TcpLogInRequest struct {
diff --git a/foreign/go/binary_serialization/send_messages_request_serializer.go b/foreign/go/binary_serialization/send_messages_request_serializer.go
index f7a3a204..9f5aae81 100644
--- a/foreign/go/binary_serialization/send_messages_request_serializer.go
+++ b/foreign/go/binary_serialization/send_messages_request_serializer.go
@@ -20,7 +20,7 @@ package binaryserialization
 import (
 	"encoding/binary"
 
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	"github.com/klauspost/compress/s2"
 )
 
diff --git a/foreign/go/binary_serialization/send_messages_request_serializer_test.go b/foreign/go/binary_serialization/send_messages_request_serializer_test.go
index c28c7c6f..b2d6983c 100644
--- a/foreign/go/binary_serialization/send_messages_request_serializer_test.go
+++ b/foreign/go/binary_serialization/send_messages_request_serializer_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"github.com/google/uuid"
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 )
 
 func TestSerialize_SendMessagesRequest(t *testing.T) {
diff --git a/foreign/go/binary_serialization/stats_serializer.go b/foreign/go/binary_serialization/stats_serializer.go
index a79dcfaf..640b5e13 100644
--- a/foreign/go/binary_serialization/stats_serializer.go
+++ b/foreign/go/binary_serialization/stats_serializer.go
@@ -21,7 +21,7 @@ import (
 	"encoding/binary"
 	"math"
 
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 )
 
 type TcpStats struct {
diff --git a/foreign/go/binary_serialization/update_stream_serializer.go b/foreign/go/binary_serialization/update_stream_serializer.go
index 71e7f38a..83b8fc02 100644
--- a/foreign/go/binary_serialization/update_stream_serializer.go
+++ b/foreign/go/binary_serialization/update_stream_serializer.go
@@ -18,7 +18,7 @@
 package binaryserialization
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 )
 
 type TcpUpdateStreamRequest struct {
diff --git a/foreign/go/binary_serialization/update_stream_serializer_test.go b/foreign/go/binary_serialization/update_stream_serializer_test.go
index 5b319c3e..6b3589a7 100644
--- a/foreign/go/binary_serialization/update_stream_serializer_test.go
+++ b/foreign/go/binary_serialization/update_stream_serializer_test.go
@@ -18,7 +18,7 @@
 package binaryserialization
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	"testing"
 )
 
diff --git a/foreign/go/binary_serialization/update_topic_serializer.go b/foreign/go/binary_serialization/update_topic_serializer.go
index 95a1e792..2b31fcd0 100644
--- a/foreign/go/binary_serialization/update_topic_serializer.go
+++ b/foreign/go/binary_serialization/update_topic_serializer.go
@@ -20,7 +20,7 @@ package binaryserialization
 import (
 	"encoding/binary"
 
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 )
 
 type TcpUpdateTopicRequest struct {
diff --git a/foreign/go/binary_serialization/update_topic_serializer_test.go b/foreign/go/binary_serialization/update_topic_serializer_test.go
index cc0fbb6a..45781f68 100644
--- a/foreign/go/binary_serialization/update_topic_serializer_test.go
+++ b/foreign/go/binary_serialization/update_topic_serializer_test.go
@@ -20,7 +20,7 @@ package binaryserialization
 import (
 	"testing"
 
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 )
 
 func TestSerialize_UpdateTopic(t *testing.T) {
diff --git a/foreign/go/cli/cli.go b/foreign/go/cli/cli.go
index 40f074f6..2b8b2f3a 100644
--- a/foreign/go/cli/cli.go
+++ b/foreign/go/cli/cli.go
@@ -23,8 +23,8 @@ import (
 	"fmt"
 	"os"
 
-	. "github.com/iggy-rs/iggy-go-client"
-	. "github.com/iggy-rs/iggy-go-client/contracts"
+	. "github.com/apache/iggy"
+	. "github.com/apache/iggy/foreign/go/contracts"
 )
 
 // CLI commands
diff --git a/foreign/go/contracts/messages.go b/foreign/go/contracts/messages.go
index d08638b3..2598d3bf 100644
--- a/foreign/go/contracts/messages.go
+++ b/foreign/go/contracts/messages.go
@@ -18,7 +18,7 @@
 package iggcon
 
 import (
-	ierror "github.com/iggy-rs/iggy-go-client/errors"
+	ierror "github.com/apache/iggy/errors"
 )
 
 const (
diff --git a/foreign/go/e2e/tcp_test/consumers_feature_create.go b/foreign/go/e2e/tcp_test/consumers_feature_create.go
index f0b427c1..c4df1cfc 100644
--- a/foreign/go/e2e/tcp_test/consumers_feature_create.go
+++ b/foreign/go/e2e/tcp_test/consumers_feature_create.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/consumers_feature_delete.go b/foreign/go/e2e/tcp_test/consumers_feature_delete.go
index d2467d7e..0b310131 100644
--- a/foreign/go/e2e/tcp_test/consumers_feature_delete.go
+++ b/foreign/go/e2e/tcp_test/consumers_feature_delete.go
@@ -18,8 +18,8 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
-	ierror "github.com/iggy-rs/iggy-go-client/errors"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
+	ierror "github.com/apache/iggy/errors"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/consumers_feature_get_all.go b/foreign/go/e2e/tcp_test/consumers_feature_get_all.go
index dfa3729a..c4f0f921 100644
--- a/foreign/go/e2e/tcp_test/consumers_feature_get_all.go
+++ b/foreign/go/e2e/tcp_test/consumers_feature_get_all.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/consumers_feature_get_by_id.go b/foreign/go/e2e/tcp_test/consumers_feature_get_by_id.go
index 1cdd164c..48f23908 100644
--- a/foreign/go/e2e/tcp_test/consumers_feature_get_by_id.go
+++ b/foreign/go/e2e/tcp_test/consumers_feature_get_by_id.go
@@ -18,8 +18,8 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
-	ierror "github.com/iggy-rs/iggy-go-client/errors"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
+	ierror "github.com/apache/iggy/errors"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/consumers_feature_join.go b/foreign/go/e2e/tcp_test/consumers_feature_join.go
index be88e4c9..3a992f2b 100644
--- a/foreign/go/e2e/tcp_test/consumers_feature_join.go
+++ b/foreign/go/e2e/tcp_test/consumers_feature_join.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/consumers_feature_leave.go b/foreign/go/e2e/tcp_test/consumers_feature_leave.go
index 9e6bf362..4ba7fc76 100644
--- a/foreign/go/e2e/tcp_test/consumers_feature_leave.go
+++ b/foreign/go/e2e/tcp_test/consumers_feature_leave.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/consumers_steps.go b/foreign/go/e2e/tcp_test/consumers_steps.go
index fea76774..dd38fdba 100644
--- a/foreign/go/e2e/tcp_test/consumers_steps.go
+++ b/foreign/go/e2e/tcp_test/consumers_steps.go
@@ -20,8 +20,8 @@ package tcp_test
 import (
 	"strconv"
 
-	"github.com/iggy-rs/iggy-go-client"
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	"github.com/apache/iggy"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
diff --git a/foreign/go/e2e/tcp_test/messages_feature_send.go b/foreign/go/e2e/tcp_test/messages_feature_send.go
index 41894f7f..ef8f549b 100644
--- a/foreign/go/e2e/tcp_test/messages_feature_send.go
+++ b/foreign/go/e2e/tcp_test/messages_feature_send.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/messages_steps.go b/foreign/go/e2e/tcp_test/messages_steps.go
index 940e82cd..4394f1af 100644
--- a/foreign/go/e2e/tcp_test/messages_steps.go
+++ b/foreign/go/e2e/tcp_test/messages_steps.go
@@ -22,8 +22,8 @@ import (
 	"reflect"
 
 	"github.com/google/uuid"
-	"github.com/iggy-rs/iggy-go-client"
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	"github.com/apache/iggy"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
diff --git a/foreign/go/e2e/tcp_test/partitions_feature_create.go b/foreign/go/e2e/tcp_test/partitions_feature_create.go
index 835f155e..64327ce6 100644
--- a/foreign/go/e2e/tcp_test/partitions_feature_create.go
+++ b/foreign/go/e2e/tcp_test/partitions_feature_create.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/partitions_feature_delete.go b/foreign/go/e2e/tcp_test/partitions_feature_delete.go
index 0e455ee0..4d011138 100644
--- a/foreign/go/e2e/tcp_test/partitions_feature_delete.go
+++ b/foreign/go/e2e/tcp_test/partitions_feature_delete.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/partitions_steps.go b/foreign/go/e2e/tcp_test/partitions_steps.go
index 6f96a57f..534f2165 100644
--- a/foreign/go/e2e/tcp_test/partitions_steps.go
+++ b/foreign/go/e2e/tcp_test/partitions_steps.go
@@ -18,8 +18,8 @@
 package tcp_test
 
 import (
-	"github.com/iggy-rs/iggy-go-client"
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	"github.com/apache/iggy"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
diff --git a/foreign/go/e2e/tcp_test/pat_feature_create.go b/foreign/go/e2e/tcp_test/pat_feature_create.go
index 397f6f05..62c5fa9c 100644
--- a/foreign/go/e2e/tcp_test/pat_feature_create.go
+++ b/foreign/go/e2e/tcp_test/pat_feature_create.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/pat_feature_delete.go b/foreign/go/e2e/tcp_test/pat_feature_delete.go
index 9862c00d..fc3b5fc7 100644
--- a/foreign/go/e2e/tcp_test/pat_feature_delete.go
+++ b/foreign/go/e2e/tcp_test/pat_feature_delete.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/pat_steps.go b/foreign/go/e2e/tcp_test/pat_steps.go
index 830970bf..64cbc3d9 100644
--- a/foreign/go/e2e/tcp_test/pat_steps.go
+++ b/foreign/go/e2e/tcp_test/pat_steps.go
@@ -18,8 +18,8 @@
 package tcp_test
 
 import (
-	"github.com/iggy-rs/iggy-go-client"
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	"github.com/apache/iggy"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
diff --git a/foreign/go/e2e/tcp_test/session_feature_login.go b/foreign/go/e2e/tcp_test/session_feature_login.go
index e065811e..4102a24c 100644
--- a/foreign/go/e2e/tcp_test/session_feature_login.go
+++ b/foreign/go/e2e/tcp_test/session_feature_login.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	. "github.com/iggy-rs/iggy-go-client/contracts"
+	. "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
diff --git a/foreign/go/e2e/tcp_test/stream_feature_create.go b/foreign/go/e2e/tcp_test/stream_feature_create.go
index 57478a34..d84f12e8 100644
--- a/foreign/go/e2e/tcp_test/stream_feature_create.go
+++ b/foreign/go/e2e/tcp_test/stream_feature_create.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/stream_feature_delete.go b/foreign/go/e2e/tcp_test/stream_feature_delete.go
index e955b101..7166e773 100644
--- a/foreign/go/e2e/tcp_test/stream_feature_delete.go
+++ b/foreign/go/e2e/tcp_test/stream_feature_delete.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/stream_feature_get_by_id.go b/foreign/go/e2e/tcp_test/stream_feature_get_by_id.go
index b9e0237c..3406144e 100644
--- a/foreign/go/e2e/tcp_test/stream_feature_get_by_id.go
+++ b/foreign/go/e2e/tcp_test/stream_feature_get_by_id.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/stream_feature_update.go b/foreign/go/e2e/tcp_test/stream_feature_update.go
index 4e4501a9..d368acbe 100644
--- a/foreign/go/e2e/tcp_test/stream_feature_update.go
+++ b/foreign/go/e2e/tcp_test/stream_feature_update.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/stream_steps.go b/foreign/go/e2e/tcp_test/stream_steps.go
index ee459090..02130fc7 100644
--- a/foreign/go/e2e/tcp_test/stream_steps.go
+++ b/foreign/go/e2e/tcp_test/stream_steps.go
@@ -20,9 +20,9 @@ package tcp_test
 import (
 	"strconv"
 
-	"github.com/iggy-rs/iggy-go-client"
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
-	ierror "github.com/iggy-rs/iggy-go-client/errors"
+	"github.com/apache/iggy"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
+	ierror "github.com/apache/iggy/errors"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
diff --git a/foreign/go/e2e/tcp_test/test_helpers.go b/foreign/go/e2e/tcp_test/test_helpers.go
index e61db65a..07247c2f 100644
--- a/foreign/go/e2e/tcp_test/test_helpers.go
+++ b/foreign/go/e2e/tcp_test/test_helpers.go
@@ -22,8 +22,8 @@ import (
 	"strings"
 	"time"
 
-	. "github.com/iggy-rs/iggy-go-client"
-	. "github.com/iggy-rs/iggy-go-client/contracts"
+	. "github.com/apache/iggy"
+	. "github.com/apache/iggy/foreign/go/contracts"
 )
 
 func createAuthorizedConnection() MessageStream {
diff --git a/foreign/go/e2e/tcp_test/test_shared_steps.go b/foreign/go/e2e/tcp_test/test_shared_steps.go
index 37607485..4b701360 100644
--- a/foreign/go/e2e/tcp_test/test_shared_steps.go
+++ b/foreign/go/e2e/tcp_test/test_shared_steps.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	ierror "github.com/iggy-rs/iggy-go-client/errors"
+	ierror "github.com/apache/iggy/errors"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
diff --git a/foreign/go/e2e/tcp_test/topic_feature_create.go b/foreign/go/e2e/tcp_test/topic_feature_create.go
index 4926140d..623ff693 100644
--- a/foreign/go/e2e/tcp_test/topic_feature_create.go
+++ b/foreign/go/e2e/tcp_test/topic_feature_create.go
@@ -20,7 +20,7 @@ package tcp_test
 import (
 	"math"
 
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/topic_feature_delete.go b/foreign/go/e2e/tcp_test/topic_feature_delete.go
index 1f2a983f..a1255c28 100644
--- a/foreign/go/e2e/tcp_test/topic_feature_delete.go
+++ b/foreign/go/e2e/tcp_test/topic_feature_delete.go
@@ -18,8 +18,8 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
-	ierror "github.com/iggy-rs/iggy-go-client/errors"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
+	ierror "github.com/apache/iggy/errors"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/topic_feature_get_all.go b/foreign/go/e2e/tcp_test/topic_feature_get_all.go
index 05b98778..063182d7 100644
--- a/foreign/go/e2e/tcp_test/topic_feature_get_all.go
+++ b/foreign/go/e2e/tcp_test/topic_feature_get_all.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/topic_feature_get_by_id.go b/foreign/go/e2e/tcp_test/topic_feature_get_by_id.go
index 60a977f3..6d6f6159 100644
--- a/foreign/go/e2e/tcp_test/topic_feature_get_by_id.go
+++ b/foreign/go/e2e/tcp_test/topic_feature_get_by_id.go
@@ -18,8 +18,8 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
-	ierror "github.com/iggy-rs/iggy-go-client/errors"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
+	ierror "github.com/apache/iggy/errors"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/topic_feature_update.go b/foreign/go/e2e/tcp_test/topic_feature_update.go
index 1c299328..3235a4b8 100644
--- a/foreign/go/e2e/tcp_test/topic_feature_update.go
+++ b/foreign/go/e2e/tcp_test/topic_feature_update.go
@@ -20,7 +20,7 @@ package tcp_test
 import (
 	"math"
 
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/topic_steps.go b/foreign/go/e2e/tcp_test/topic_steps.go
index ac47ef8b..c5ec95dc 100644
--- a/foreign/go/e2e/tcp_test/topic_steps.go
+++ b/foreign/go/e2e/tcp_test/topic_steps.go
@@ -21,9 +21,9 @@ import (
 	"math"
 	"strconv"
 
-	"github.com/iggy-rs/iggy-go-client"
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
-	ierror "github.com/iggy-rs/iggy-go-client/errors"
+	"github.com/apache/iggy"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
+	ierror "github.com/apache/iggy/errors"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
diff --git a/foreign/go/e2e/tcp_test/users_feature_create.go b/foreign/go/e2e/tcp_test/users_feature_create.go
index 4cf042cd..df658953 100644
--- a/foreign/go/e2e/tcp_test/users_feature_create.go
+++ b/foreign/go/e2e/tcp_test/users_feature_create.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/users_feature_delete.go b/foreign/go/e2e/tcp_test/users_feature_delete.go
index e4ee67d1..c320e95a 100644
--- a/foreign/go/e2e/tcp_test/users_feature_delete.go
+++ b/foreign/go/e2e/tcp_test/users_feature_delete.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/users_feature_get_by_id.go b/foreign/go/e2e/tcp_test/users_feature_get_by_id.go
index 412185a5..f3f983cd 100644
--- a/foreign/go/e2e/tcp_test/users_feature_get_by_id.go
+++ b/foreign/go/e2e/tcp_test/users_feature_get_by_id.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/users_feature_password.go b/foreign/go/e2e/tcp_test/users_feature_password.go
index 393378c1..1972980f 100644
--- a/foreign/go/e2e/tcp_test/users_feature_password.go
+++ b/foreign/go/e2e/tcp_test/users_feature_password.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/users_feature_permissions.go b/foreign/go/e2e/tcp_test/users_feature_permissions.go
index f9594a00..21e6cbab 100644
--- a/foreign/go/e2e/tcp_test/users_feature_permissions.go
+++ b/foreign/go/e2e/tcp_test/users_feature_permissions.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/users_feature_update.go b/foreign/go/e2e/tcp_test/users_feature_update.go
index a777b12c..aa7d6327 100644
--- a/foreign/go/e2e/tcp_test/users_feature_update.go
+++ b/foreign/go/e2e/tcp_test/users_feature_update.go
@@ -18,7 +18,7 @@
 package tcp_test
 
 import (
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/foreign/go/e2e/tcp_test/users_steps.go b/foreign/go/e2e/tcp_test/users_steps.go
index e4ebb63a..88521351 100644
--- a/foreign/go/e2e/tcp_test/users_steps.go
+++ b/foreign/go/e2e/tcp_test/users_steps.go
@@ -18,8 +18,8 @@
 package tcp_test
 
 import (
-	"github.com/iggy-rs/iggy-go-client"
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	"github.com/apache/iggy"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
diff --git a/foreign/go/go.mod b/foreign/go/go.mod
index 9df789a9..cc67702f 100644
--- a/foreign/go/go.mod
+++ b/foreign/go/go.mod
@@ -1,4 +1,4 @@
-module github.com/iggy-rs/iggy-go-client
+module github.com/apache/iggy/foreign/go
 
 go 1.23.0
 
diff --git a/foreign/go/message_stream.go b/foreign/go/message_stream.go
index 0c79ef1b..706512ad 100644
--- a/foreign/go/message_stream.go
+++ b/foreign/go/message_stream.go
@@ -17,7 +17,7 @@
 
 package iggy
 
-import . "github.com/iggy-rs/iggy-go-client/contracts"
+import . "github.com/apache/iggy/foreign/go/contracts"
 
 type MessageStream interface {
 	GetStreamById(request GetStreamRequest) (*StreamResponse, error)
diff --git a/foreign/go/message_stream_factory.go b/foreign/go/message_stream_factory.go
index ee949459..cd555ca5 100644
--- a/foreign/go/message_stream_factory.go
+++ b/foreign/go/message_stream_factory.go
@@ -21,9 +21,9 @@ import (
 	"context"
 	"errors"
 
-	"github.com/iggy-rs/iggy-go-client/tcp"
+	"github.com/apache/iggy/tcp"
 
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
 )
 
 type IMessageStreamFactory interface {
diff --git a/foreign/go/samples/README.md b/foreign/go/samples/README.md
index c7b82f8f..87fef368 100644
--- a/foreign/go/samples/README.md
+++ b/foreign/go/samples/README.md
@@ -2,5 +2,5 @@
 
 Check out our sample projects below:
 
-- <a href="https://github.com/iggy-rs/iggy-go-client/blob/dev/samples/consumer/README.md">Consumer</a> - simple message consumer implementation.
-- <a href="https://github.com/iggy-rs/iggy-go-client/blob/dev/samples/producer/README.md">Producer</a> - simple message producer implementation.
+- <a href="https://github.com/apache/iggy/blob/dev/samples/consumer/README.md">Consumer</a> - simple message consumer implementation.
+- <a href="https://github.com/apache/iggy/blob/dev/samples/producer/README.md">Producer</a> - simple message producer implementation.
diff --git a/foreign/go/samples/consumer/README.md b/foreign/go/samples/consumer/README.md
index 8350bb2a..783b6d1e 100644
--- a/foreign/go/samples/consumer/README.md
+++ b/foreign/go/samples/consumer/README.md
@@ -21,7 +21,7 @@ In order to successfully launch the consumer app follow these steps:
 1. Clone iggy repo and run it in background
 
     ```sh
-    git clone https://github.com/iggy-rs/iggy.git
+    git clone https://github.com/apache/iggy.git
     cd iggy
     cargo run --bin iggy-server -r
     ```
diff --git a/foreign/go/samples/consumer/consumer.go b/foreign/go/samples/consumer/consumer.go
index 81373039..adf6a7bc 100644
--- a/foreign/go/samples/consumer/consumer.go
+++ b/foreign/go/samples/consumer/consumer.go
@@ -23,9 +23,9 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/iggy-rs/iggy-go-client"
-	. "github.com/iggy-rs/iggy-go-client/contracts"
-	sharedDemoContracts "github.com/iggy-rs/iggy-go-client/samples/shared"
+	. "github.com/apache/iggy"
+	. "github.com/apache/iggy/foreign/go/contracts"
+	sharedDemoContracts "github.com/apache/iggy/samples/shared"
 )
 
 // config
diff --git a/foreign/go/samples/producer/README.md b/foreign/go/samples/producer/README.md
index 2386594f..a64dbd6b 100644
--- a/foreign/go/samples/producer/README.md
+++ b/foreign/go/samples/producer/README.md
@@ -21,7 +21,7 @@ In order to successfully launch the producer app follow these steps:
 1. Clone iggy repo and run it in background
 
     ```sh
-    git clone https://github.com/iggy-rs/iggy.git
+    git clone https://github.com/apache/iggy.git
     cd iggy
     cargo run --bin iggy-server -r
     ```
diff --git a/foreign/go/samples/producer/message_generator.go b/foreign/go/samples/producer/message_generator.go
index cdd507ba..0677fe40 100644
--- a/foreign/go/samples/producer/message_generator.go
+++ b/foreign/go/samples/producer/message_generator.go
@@ -21,7 +21,7 @@ import (
 	"math/rand"
 	"time"
 
-	sharedDemoContracts "github.com/iggy-rs/iggy-go-client/samples/shared"
+	sharedDemoContracts "github.com/apache/iggy/samples/shared"
 )
 
 type MessageGenerator struct {
diff --git a/foreign/go/samples/producer/producer.go b/foreign/go/samples/producer/producer.go
index 1fcc0188..8f4adeeb 100644
--- a/foreign/go/samples/producer/producer.go
+++ b/foreign/go/samples/producer/producer.go
@@ -23,9 +23,9 @@ import (
 
 	"github.com/google/uuid"
 
-	. "github.com/iggy-rs/iggy-go-client"
-	. "github.com/iggy-rs/iggy-go-client/contracts"
-	sharedDemoContracts "github.com/iggy-rs/iggy-go-client/samples/shared"
+	. "github.com/apache/iggy"
+	. "github.com/apache/iggy/foreign/go/contracts"
+	sharedDemoContracts "github.com/apache/iggy/samples/shared"
 )
 
 const (
diff --git a/foreign/go/tcp/tcp_access_token_managament.go b/foreign/go/tcp/tcp_access_token_managament.go
index c9c3f775..06176dd2 100644
--- a/foreign/go/tcp/tcp_access_token_managament.go
+++ b/foreign/go/tcp/tcp_access_token_managament.go
@@ -18,8 +18,8 @@
 package tcp
 
 import (
-	binaryserialization "github.com/iggy-rs/iggy-go-client/binary_serialization"
-	. "github.com/iggy-rs/iggy-go-client/contracts"
+	binaryserialization "github.com/apache/iggy/binary_serialization"
+	. "github.com/apache/iggy/foreign/go/contracts"
 )
 
 func (tms *IggyTcpClient) CreateAccessToken(request CreateAccessTokenRequest) (*AccessToken, error) {
diff --git a/foreign/go/tcp/tcp_clients_managament.go b/foreign/go/tcp/tcp_clients_managament.go
index 71acea37..1e16c4c1 100644
--- a/foreign/go/tcp/tcp_clients_managament.go
+++ b/foreign/go/tcp/tcp_clients_managament.go
@@ -18,8 +18,8 @@
 package tcp
 
 import (
-	binaryserialization "github.com/iggy-rs/iggy-go-client/binary_serialization"
-	. "github.com/iggy-rs/iggy-go-client/contracts"
+	binaryserialization "github.com/apache/iggy/binary_serialization"
+	. "github.com/apache/iggy/foreign/go/contracts"
 )
 
 func (tms *IggyTcpClient) GetClients() ([]ClientResponse, error) {
diff --git a/foreign/go/tcp/tcp_consumer_group_managament.go b/foreign/go/tcp/tcp_consumer_group_managament.go
index de6bb2f3..785f89eb 100644
--- a/foreign/go/tcp/tcp_consumer_group_managament.go
+++ b/foreign/go/tcp/tcp_consumer_group_managament.go
@@ -18,9 +18,9 @@
 package tcp
 
 import (
-	binaryserialization "github.com/iggy-rs/iggy-go-client/binary_serialization"
-	. "github.com/iggy-rs/iggy-go-client/contracts"
-	ierror "github.com/iggy-rs/iggy-go-client/errors"
+	binaryserialization "github.com/apache/iggy/binary_serialization"
+	. "github.com/apache/iggy/foreign/go/contracts"
+	ierror "github.com/apache/iggy/errors"
 )
 
 func (tms *IggyTcpClient) GetConsumerGroups(streamId, topicId Identifier) ([]ConsumerGroupResponse, error) {
diff --git a/foreign/go/tcp/tcp_core.go b/foreign/go/tcp/tcp_core.go
index d31b00b0..63865ae5 100644
--- a/foreign/go/tcp/tcp_core.go
+++ b/foreign/go/tcp/tcp_core.go
@@ -24,9 +24,9 @@ import (
 	"sync"
 	"time"
 
-	. "github.com/iggy-rs/iggy-go-client/contracts"
-	iggcon "github.com/iggy-rs/iggy-go-client/contracts"
-	ierror "github.com/iggy-rs/iggy-go-client/errors"
+	. "github.com/apache/iggy/foreign/go/contracts"
+	iggcon "github.com/apache/iggy/foreign/go/contracts"
+	ierror "github.com/apache/iggy/errors"
 )
 
 type IggyTcpClient struct {
@@ -125,8 +125,8 @@ func (tms *IggyTcpClient) sendAndFetchResponse(message []byte, command CommandCo
 
 	length := int(binary.LittleEndian.Uint32(buffer[4:]))
 	if responseCode := getResponseCode(buffer); responseCode != 0 {
-		// TEMP: See https://github.com/iggy-rs/iggy/pull/604 for context.
-		// from: https://github.com/iggy-rs/iggy/blob/master/sdk/src/tcp/client.rs#L326
+		// TEMP: See https://github.com/apache/iggy/pull/604 for context.
+		// from: https://github.com/apache/iggy/blob/master/sdk/src/tcp/client.rs#L326
 		if responseCode == 2012 ||
 			responseCode == 2013 ||
 			responseCode == 1011 ||
diff --git a/foreign/go/tcp/tcp_messaging.go b/foreign/go/tcp/tcp_messaging.go
index 6b431818..03b988f3 100644
--- a/foreign/go/tcp/tcp_messaging.go
+++ b/foreign/go/tcp/tcp_messaging.go
@@ -18,9 +18,9 @@
 package tcp
 
 import (
-	binaryserialization "github.com/iggy-rs/iggy-go-client/binary_serialization"
-	. "github.com/iggy-rs/iggy-go-client/contracts"
-	ierror "github.com/iggy-rs/iggy-go-client/errors"
+	binaryserialization "github.com/apache/iggy/binary_serialization"
+	. "github.com/apache/iggy/foreign/go/contracts"
+	ierror "github.com/apache/iggy/errors"
 )
 
 func (tms *IggyTcpClient) SendMessages(request SendMessagesRequest) error {
diff --git a/foreign/go/tcp/tcp_offset_managament.go b/foreign/go/tcp/tcp_offset_managament.go
index bbf675f9..fb0b63f0 100644
--- a/foreign/go/tcp/tcp_offset_managament.go
+++ b/foreign/go/tcp/tcp_offset_managament.go
@@ -18,8 +18,8 @@
 package tcp
 
 import (
-	binaryserialization "github.com/iggy-rs/iggy-go-client/binary_serialization"
-	. "github.com/iggy-rs/iggy-go-client/contracts"
+	binaryserialization "github.com/apache/iggy/binary_serialization"
+	. "github.com/apache/iggy/foreign/go/contracts"
 )
 
 func (tms *IggyTcpClient) GetOffset(request GetOffsetRequest) (*OffsetResponse, error) {
diff --git a/foreign/go/tcp/tcp_partition_managament.go b/foreign/go/tcp/tcp_partition_managament.go
index 3d971147..ff1df45b 100644
--- a/foreign/go/tcp/tcp_partition_managament.go
+++ b/foreign/go/tcp/tcp_partition_managament.go
@@ -18,8 +18,8 @@
 package tcp
 
 import (
-	binaryserialization "github.com/iggy-rs/iggy-go-client/binary_serialization"
-	. "github.com/iggy-rs/iggy-go-client/contracts"
+	binaryserialization "github.com/apache/iggy/binary_serialization"
+	. "github.com/apache/iggy/foreign/go/contracts"
 )
 
 func (tms *IggyTcpClient) CreatePartition(request CreatePartitionsRequest) error {
diff --git a/foreign/go/tcp/tcp_session_managament.go b/foreign/go/tcp/tcp_session_managament.go
index b1d6d93a..2c7a3e0f 100644
--- a/foreign/go/tcp/tcp_session_managament.go
+++ b/foreign/go/tcp/tcp_session_managament.go
@@ -18,9 +18,9 @@
 package tcp
 
 import (
-	binaryserialization "github.com/iggy-rs/iggy-go-client/binary_serialization"
+	binaryserialization "github.com/apache/iggy/binary_serialization"
 
-	. "github.com/iggy-rs/iggy-go-client/contracts"
+	. "github.com/apache/iggy/foreign/go/contracts"
 )
 
 func (tms *IggyTcpClient) LogIn(request LogInRequest) (*LogInResponse, error) {
diff --git a/foreign/go/tcp/tcp_stream_managament.go b/foreign/go/tcp/tcp_stream_managament.go
index b7e2232f..0dbe4ebd 100644
--- a/foreign/go/tcp/tcp_stream_managament.go
+++ b/foreign/go/tcp/tcp_stream_managament.go
@@ -18,9 +18,9 @@
 package tcp
 
 import (
-	binaryserialization "github.com/iggy-rs/iggy-go-client/binary_serialization"
-	. "github.com/iggy-rs/iggy-go-client/contracts"
-	ierror "github.com/iggy-rs/iggy-go-client/errors"
+	binaryserialization "github.com/apache/iggy/binary_serialization"
+	. "github.com/apache/iggy/foreign/go/contracts"
+	ierror "github.com/apache/iggy/errors"
 )
 
 func (tms *IggyTcpClient) GetStreams() ([]StreamResponse, error) {
diff --git a/foreign/go/tcp/tcp_topic_managament.go b/foreign/go/tcp/tcp_topic_managament.go
index 346c8306..11f8bc4b 100644
--- a/foreign/go/tcp/tcp_topic_managament.go
+++ b/foreign/go/tcp/tcp_topic_managament.go
@@ -18,9 +18,9 @@
 package tcp
 
 import (
-	binaryserialization "github.com/iggy-rs/iggy-go-client/binary_serialization"
-	. "github.com/iggy-rs/iggy-go-client/contracts"
-	ierror "github.com/iggy-rs/iggy-go-client/errors"
+	binaryserialization "github.com/apache/iggy/binary_serialization"
+	. "github.com/apache/iggy/foreign/go/contracts"
+	ierror "github.com/apache/iggy/errors"
 )
 
 func (tms *IggyTcpClient) GetTopics(streamId Identifier) ([]TopicResponse, error) {
diff --git a/foreign/go/tcp/tcp_user_managament.go b/foreign/go/tcp/tcp_user_managament.go
index 48a95c07..37debad5 100644
--- a/foreign/go/tcp/tcp_user_managament.go
+++ b/foreign/go/tcp/tcp_user_managament.go
@@ -18,9 +18,9 @@
 package tcp
 
 import (
-	binaryserialization "github.com/iggy-rs/iggy-go-client/binary_serialization"
-	. "github.com/iggy-rs/iggy-go-client/contracts"
-	ierror "github.com/iggy-rs/iggy-go-client/errors"
+	binaryserialization "github.com/apache/iggy/binary_serialization"
+	. "github.com/apache/iggy/foreign/go/contracts"
+	ierror "github.com/apache/iggy/errors"
 )
 
 func (tms *IggyTcpClient) GetUser(identifier Identifier) (*UserResponse, error) {
diff --git a/foreign/go/tcp/tcp_utilities.go b/foreign/go/tcp/tcp_utilities.go
index a1a16c1f..54f85b87 100644
--- a/foreign/go/tcp/tcp_utilities.go
+++ b/foreign/go/tcp/tcp_utilities.go
@@ -18,8 +18,8 @@
 package tcp
 
 import (
-	binaryserialization "github.com/iggy-rs/iggy-go-client/binary_serialization"
-	. "github.com/iggy-rs/iggy-go-client/contracts"
+	binaryserialization "github.com/apache/iggy/binary_serialization"
+	. "github.com/apache/iggy/foreign/go/contracts"
 )
 
 func (tms *IggyTcpClient) GetStats() (*Stats, error) {
diff --git a/foreign/node/README.md b/foreign/node/README.md
index 7f8f33b9..93d24029 100644
--- a/foreign/node/README.md
+++ b/foreign/node/README.md
@@ -1,6 +1,6 @@
-# iggy node.js client
+# Apache Iggy Node.js Client
 
-iggy node.js client for [iggy-rs](https://iggy.rs/)'s binary protocol, written in typescript. it currently only support tcp & tls transports.
+Apache Iggy Node.js client written in typescript, it currently only supports tcp & tls transports.
 
 diclaimer: although all iggy commands & basic client/stream are implemented this is still a WIP, provided as is, and has still a long way to go to be considered "battle tested".
 
diff --git a/foreign/node/docker-compose.yml b/foreign/node/docker-compose.yml
index 50f0c7df..b3006464 100644
--- a/foreign/node/docker-compose.yml
+++ b/foreign/node/docker-compose.yml
@@ -17,7 +17,7 @@
 
 services:
   iggy-server:
-    image: iggyrs/iggy:latest
+    image: apache/iggy:latest
     container_name: iggy-server
     restart: unless-stopped
     networks:
diff --git a/foreign/node/package.json b/foreign/node/package.json
index 995bf215..ee217e81 100644
--- a/foreign/node/package.json
+++ b/foreign/node/package.json
@@ -5,7 +5,6 @@
   "description": "Official apache iggy nodejs binary client",
   "keywords": [
     "iggy",
-    "iggy-rs",
     "driver",
     "client",
     "protocol"
@@ -19,7 +18,7 @@
     "main": "dist/index.js",
     "types": "dist/index.d.ts"
   },
-  "homepage": "https://iggy.rs",
+  "homepage": "https://iggy.apache.org",
   "files": [
     "dist/**/*.js",
     "dist/**/*.d.ts",
diff --git a/foreign/python/.devcontainer/docker-compose.yml b/foreign/python/.devcontainer/docker-compose.yml
index 98128bd2..74f8917a 100644
--- a/foreign/python/.devcontainer/docker-compose.yml
+++ b/foreign/python/.devcontainer/docker-compose.yml
@@ -26,5 +26,5 @@ services:
     command: sleep infinity
 
   iggy:
-    image: iggyrs/iggy:latest
+    image: apache/iggy:latest
     restart: unless-stopped
diff --git a/foreign/python/Cargo.toml b/foreign/python/Cargo.toml
index 1d426027..018fc089 100644
--- a/foreign/python/Cargo.toml
+++ b/foreign/python/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 authors = ["Dario Lencina Talarico <da...@gmail.com>"]
 license = "Apache-2.0"
 description = "Apache Iggy is the persistent message streaming platform written in Rust, supporting QUIC, TCP and HTTP transport protocols, capable of processing millions of messages per second."
-documentation = "https://docs.iggy.rs"
+documentation = "https://iggy.apache.org/docs/"
 repository = "https://github.com/apache/iggy"
 
 [dependencies]
diff --git a/foreign/python/README.md b/foreign/python/README.md
index c3ff44ae..be4f5a7c 100644
--- a/foreign/python/README.md
+++ b/foreign/python/README.md
@@ -1,6 +1,6 @@
 # iggy_py
 
-[![discord-badge](https://img.shields.io/discord/1144142576266530928)](https://iggy.rs/discord)
+[![discord-badge](https://img.shields.io/discord/1144142576266530928)](https://discord.gg/C5Sux5NcRa)
 
 Apache Iggy is the persistent message streaming platform written in Rust, supporting QUIC, TCP and HTTP transport protocols, capable of processing millions of messages per second.
 
diff --git a/foreign/python/pyproject.toml b/foreign/python/pyproject.toml
index ac1bb550..92d0affb 100644
--- a/foreign/python/pyproject.toml
+++ b/foreign/python/pyproject.toml
@@ -34,11 +34,11 @@ classifiers = [
 ]
 
 [project.urls]
-"Homepage" = "https://iggy.rs"
-"Documentation" = "https://docs.iggy.rs"
-"Repository" = "https://github.com/iggy-rs/iggy"
-"Bug Tracker" = "https://github.com/iggy-rs/iggy/issues"
-"Discord" = "https://iggy.rs/discord"
+"Homepage" = "https://iggy.apache.org"
+"Documentation" = "https://iggy.apache.org/docs/"
+"Repository" = "https://github.com/apache/iggy"
+"Bug Tracker" = "https://github.com/apache/iggy/issues"
+"Discord" = "https://discord.gg/C5Sux5NcRa"
 
 [tool.maturin]
 features = ["pyo3/extension-module"]
diff --git a/web/README.md b/web/README.md
index 5356608d..9e2c6e0e 100644
--- a/web/README.md
+++ b/web/README.md
@@ -1,6 +1,6 @@
 # Apache Iggy (Incubating) Web UI
 
-This repository hosts the web user interface for [Iggy](https://github.com/iggy-rs/iggy), a persistent message streaming platform written in Rust. The web UI is built using SvelteKit.
+This proejcts hosts the web user interface for Apache Iggy. The web UI is built using SvelteKit.
 
 ![iggy](static/signIn.png)
 ![iggy](static/stats.png)
@@ -17,17 +17,17 @@ The Iggy Web UI provides a user-friendly panel for managing various aspects of t
 1. **Run Iggy server first**
 
    ```sh
-   docker pull iggyrs/iggy:latest
+   docker pull apache/iggy:latest
    ```
 
    ```sh
-   docker run -p 3000:3000 -p 8090:8090 iggyrs/iggy:latest
+   docker run -p 3000:3000 -p 8090:8090 apache/iggy:latest
    ```
 
 1. **Clone the repository:**
 
    ```sh
-   git clone https://github.com/iggy-rs/iggy-web-ui.git
+   git clone https://github.com/apache/iggy.git
    ```
 
 1. **Build the project:**