diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index b59dfce..7a2a88b 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -11,7 +11,7 @@ We would like to start with saying thank you for wanting to contribute to Kallio
 
 1. [Fork](http://help.github.com/forking/) on GitHub
 1. Clone your fork locally
-1. Configure the upstream repo (`git remote add upstream git://github.com/RHEAGROUP/Kalliope`) 
+1. Configure the upstream repo (`git remote add upstream git://github.com/STARIONGROUP/Kalliope`) 
 1. Checkout development
 1. Create a local branch (`git checkout -b myBranch`) from development
 1. Work on your feature
@@ -44,9 +44,9 @@ When you're ready to go you should confirm that you are up to date and rebased w
 
 1. `git push origin myBranch`
 1. Send a descriptive [Pull Request](https://help.github.com/articles/creating-a-pull-request/) on GitHub - making sure you have selected the correct branch in the GitHub UI!
-1. Wait for @samatrhea to merge your changes in.
+1. Wait for @samatstarion to merge your changes in.
 
-And remember; **A pull-request with tests is a pull-request that's likely to be pulled in.** :grin: Bonus points if you document your feature in our [wiki](https://github.com/RHEAGROUP/Kalliope/wiki) once it has been pulled in
+And remember; **A pull-request with tests is a pull-request that's likely to be pulled in.** :grin: Bonus points if you document your feature in our [wiki](https://github.com/STARIONGROUP/Kalliope/wiki) once it has been pulled in
 
 ## Style Guidelines
 
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 64b0208..6ae6eed 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -2,7 +2,7 @@
 
 - [ ] I have written a descriptive issue title
 - [ ] I have verified that I am running the latest version of the Kalliope
-- [ ] I have searched [open](https://github.com/RHEAGROUP/Kalliope/issues) and [closed](https://github.com/RHEAGROUP/Kalliope/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported
+- [ ] I have searched [open](https://github.com/STARIONGROUP/Kalliope/issues) and [closed](https://github.com/STARIONGROUP/Kalliope/issues?q=is%3Aissue+is%3Aclosed) issues to ensure it has not already been reported
 
 ### Description
 <!-- A description of the bug or feature -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 17510cb..a44f28d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,8 @@
 ### Prerequisites
 
 - [ ] I have written a descriptive pull-request title
-- [ ] I have verified that there are no overlapping [pull-requests](https://github.com/RHEAGROUP/Kalliope/pulls) open
-- [ ] I have verified that I am following the Kalliope [code style guidelines](https://raw.githubusercontent.com/RHEAGROUP/Kalliope/master/.github/CONTRIBUTING.md)
+- [ ] I have verified that there are no overlapping [pull-requests](https://github.com/STARIONGROUP/Kalliope/pulls) open
+- [ ] I have verified that I am following the Kalliope [code style guidelines](https://raw.githubusercontent.com/STARIONGROUP/Kalliope/master/.github/CONTRIBUTING.md)
 - [ ] I have provided test coverage for my change (where applicable)
 
 ### Description
diff --git a/README.md b/README.md
index 79873d7..fe8a237 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 [![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=STARIONGROUP_Kalliope&metric=sqale_index)](https://sonarcloud.io/summary/new_code?id=STARIONGROUP_Kalliope)
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=STARIONGROUP_Kalliope&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=STARIONGROUP_Kalliope)
 
-Kalliope is a set of C# libraries used to read and write ORM2 files. Kalliope is used in RHEA products and projects to perform code generation.
+Kalliope is a set of C# libraries used to read and write ORM2 files. Kalliope is used in Starion Group products and projects to perform code generation.
 
 ## Installation
 
diff --git a/pre-release-nuget.bat b/pre-release-nuget.bat
index eb2fdc0..3280a28 100644
--- a/pre-release-nuget.bat
+++ b/pre-release-nuget.bat
@@ -44,7 +44,7 @@ ECHO.
 for %%f in (%~dp0PreReleaseBuilds\*.nupkg) do (
     (Echo "%%f" | FIND /I "symbols" 1>NUL) || (
         echo Pushing %%f
-        dotnet nuget push "%%f" -s https://nuget.pkg.github.com/RHEAGROUP/index.json -k %apikey%
+        dotnet nuget push "%%f" -s https://nuget.pkg.github.com/STARIONGROUP/index.json -k %apikey%
     )
 )