diff --git a/README.md b/README.md
index b9a61d1..f4ba4bf 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ Refer to the [`examples`](examples) folder for the source code of this and other
### API Reference
-You can find the API reference [here](https://railsware.github.io/mailtrap-java/index.html).
+You can find the API reference [here](https://mailtrap.github.io/mailtrap-java/index.html).
### General API
@@ -144,7 +144,7 @@ You can find the API reference [here](https://railsware.github.io/mailtrap-java/
## Contributing
-Bug reports and pull requests are welcome on [GitHub](https://github.com/railsware/mailtrap-java). This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on [GitHub](https://github.com/mailtrap/mailtrap-java). This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](CODE_OF_CONDUCT.md).
## License
diff --git a/docs/index.md b/docs/index.md
index b26abf1..a8f0c4b 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -15,4 +15,4 @@ This client allows you to quickly and easily integrate your Java application wit
## License
-Licensed under the MIT License.
+Licensed under the MIT License.
diff --git a/docs/usage-examples.md b/docs/usage-examples.md
index c511db0..c80077a 100644
--- a/docs/usage-examples.md
+++ b/docs/usage-examples.md
@@ -1,3 +1,3 @@
# Detailed Usage Examples
-Code examples covering all APIs can be found here.
+Code examples covering all APIs can be found here.
diff --git a/pom.xml b/pom.xml
index 1e48f8e..b280de5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,8 +31,8 @@
- https://github.com/railsware/mailtrap-java
- scm:git:git://github.com/railsware/mailtrap-java.git
+ https://github.com/mailtrap/mailtrap-java
+ scm:git:git://github.com/mailtrap/mailtrap-java.git
diff --git a/src/main/java/io/mailtrap/http/impl/DefaultMailtrapHttpClient.java b/src/main/java/io/mailtrap/http/impl/DefaultMailtrapHttpClient.java
index 748a6b9..f653d6e 100644
--- a/src/main/java/io/mailtrap/http/impl/DefaultMailtrapHttpClient.java
+++ b/src/main/java/io/mailtrap/http/impl/DefaultMailtrapHttpClient.java
@@ -169,7 +169,7 @@ private HttpRequest.Builder prepareRequest(final String url, final RequestData r
.header("Accept", "application/json")
.header("Content-Type", "application/json; charset=UTF-8")
.header("Authorization", "Bearer " + token)
- .header("User-Agent", "mailtrap-java (https://github.com/railsware/mailtrap-java)");
+ .header("User-Agent", "mailtrap-java (https://github.com/mailtrap/mailtrap-java)");
final Map headers = new HashMap<>(requestData.getHeaders());
for (Map.Entry entry : headers.entrySet()) {