diff --git a/README.md b/README.md
index ee1fdd5..6329ab4 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ First, install [Yeoman](http://yeoman.io) and generator-systemd using [npm](http
 
 ```bash
 npm install -g yo
-npm install -g generator-systemd
+npm install -g @omm/generator-systemd
 ```
 
 Then generate your new project:
@@ -19,8 +19,8 @@ yo systemd
 ## License
 MIT
 
-[npm-image]: https://badge.fury.io/js/generator-systemd.svg
-[npm-url]: https://npmjs.org/package/generator-systemd
+[npm-image]: https://badge.fury.io/js/%40omm%2Fgenerator-systemd.svg
+[npm-url]: https://badge.fury.io/js/%40omm%2Fgenerator-systemd
 [travis-image]: https://travis-ci.org/ommsolutions/generator-systemd.svg?branch=master
 [travis-url]: https://travis-ci.org/ommsolutions/generator-systemd
 [coveralls-image]:https://coveralls.io/repos/github/ommsolutions/generator-systemd/badge.svg?branch=master
diff --git a/package.json b/package.json
index e77b46d..4ace0e0 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "generator-systemd",
+  "name": "@omm/generator-systemd",
   "version": "0.1.0",
   "description": "Generates a systemd service unit",
-  "homepage": "https://github.com/ommsolutions",
+  "homepage": "https://github.com/ommsolutions/generator-systemd",
   "author": {
     "name": "Andreas Enenkel",
     "email": "ae@omm-solutions.de"
@@ -54,6 +54,6 @@
   "engines": {
     "node": ">=6.0.0"
   },
-  "repository": "https://gitlab.omm.cloud/ae/generator-systemd",
+  "repository": "https://github.com/ommsolutions/generator-systemd",
   "license": "MIT"
 }