diff --git a/bak/game-lib-d3-rigid-body.js b/bak/game-lib-d3-rigid-body.js
index ec1ee6a..b2e7be2 100644
--- a/bak/game-lib-d3-rigid-body.js
+++ b/bak/game-lib-d3-rigid-body.js
@@ -61,7 +61,7 @@ GameLib.D3.RigidBody = function(
     this.engine.isNotCannonThrow();
     this.instance = this.createInstance();
 
-    // Todo: this should be executed somewhere in game-lib-z, so that we don't execute it on every construction of an object.
+    // Todo: this should be executed somewhere in r3-z, so that we don't execute it on every construction of an object.
     GameLib.Utils.Extend(GameLib.D3.RigidBody, GameLib.Component);
 };
 
diff --git a/gulpfile.js b/gulpfile.js
index d89ff57..b2d99b6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -19,9 +19,9 @@ gulp.task(
         console.log("Compiling start at", __DATE__);
 
         var __EXTENDS__ = "";
-        return gulp.src('./src/game-lib-*.js')
+        return gulp.src('./src/r3-*.js')
             .pipe(sort())
-            .pipe(concat('game-lib.js'))
+            .pipe(concat('r3.js'))
             .pipe(
                 inject.prepend(
                     "// COMPILE TIME DEFINITIONS (Generated via gulp) \n" +
@@ -58,7 +58,7 @@ gulp.task(
 );
 
 gulp.task('test-prepare', function(){
-    return gulp.src('./build/game-lib.js')
+    return gulp.src('./build/r3.js')
         .pipe(plumber())
         .pipe(istanbul())
         .pipe(istanbul.hookRequire())
@@ -95,8 +95,8 @@ gulp.task(
 
 gulp.task('compileRuntime', ['merge'],
     function() {
-        gulp.src(['./defines/runtime.js', './build/game-lib.js'])
-            .pipe(concat('game-lib-runtime.js'))
+        gulp.src(['./defines/runtime.js', './build/r3.js'])
+            .pipe(concat('r3-runtime.js'))
             .pipe(preprocessor(
                 {
                     // End of line character
@@ -134,8 +134,8 @@ gulp.task('compileRuntime', ['merge'],
 
 gulp.task('compileEditor', ['merge'],
     function() {
-        gulp.src(['./defines/editor.js', './build/game-lib.js'])
-            .pipe(concat('game-lib-editor.js'))
+        gulp.src(['./defines/editor.js', './build/r3.js'])
+            .pipe(concat('r3-editor.js'))
             .pipe(preprocessor(
                 {
                     // End of line character
diff --git a/package-lock.json b/package-lock.json
index 025978a..7c187bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "spoon-game-lib",
+  "name": "spoon-r3",
   "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
diff --git a/package.json b/package.json
index 6e5830c..2cc0fb6 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "spoon-game-lib",
+  "name": "spoon-r3",
   "description": "Flying Spoon Game Library",
   "version": "1.0.0",
-  "repository": "https://bitbucket.org/flyingspoon/editor-game-lib.git",
+  "repository": "https://bitbucket.org/flyingspoon/editor-r3.git",
   "license": "UNLICENSED",
   "dependencies": {
     "cannon": "^0.6.2",
diff --git a/src/game-lib-graphics-runtime-impact.js b/src/game-lib-graphics-runtime-impact.js
index 31f211f..2ad1c8d 100644
--- a/src/game-lib-graphics-runtime-impact.js
+++ b/src/game-lib-graphics-runtime-impact.js
@@ -37,7 +37,7 @@ GameLib.GraphicsRuntime.Impact.prototype.createInstance = function() {
     this.instance = ig;
 
     /**
-     * We override the game load to lookup the canvas from our game-lib and not the DOM, since our canvas
+     * We override the game load to lookup the canvas from our r3 and not the DOM, since our canvas
      * does not necessarily live inside the DOM
      */
     ig.System.inject({
diff --git a/test/test.gameLib.js b/test/test.gameLib.js
index d2b16aa..5a36842 100644
--- a/test/test.gameLib.js
+++ b/test/test.gameLib.js
@@ -3,7 +3,7 @@ var chai        = require('chai'),
     sinonChai   = require("sinon-chai"),
     config      = require('../config.js'),
     assert      = chai.assert,
-    GameLib     = require('../build/game-lib'),
+    GameLib     = require('../build/r3'),
     CANNON      = require('cannon'),
     THREE       = require('three');