diff --git a/README.md b/README.md
index 1f1e8aa70be..b2bf132d859 100644
--- a/README.md
+++ b/README.md
@@ -1,31 +1,31 @@
 # GraphQL Server for Express, Connect, Hapi and Koa
 
-[![npm version](https://badge.fury.io/js/apollo-server.svg)](https://badge.fury.io/js/apollo-server)
-[![Build Status](https://travis-ci.org/apollostack/apollo-server.svg?branch=master)](https://travis-ci.org/apollostack/apollo-server)
-[![Coverage Status](https://coveralls.io/repos/github/apollostack/apollo-server/badge.svg?branch=master)](https://coveralls.io/github/apollostack/apollo-server?branch=master)
+[![npm version](https://badge.fury.io/js/graphql-server.svg)](https://badge.fury.io/js/graphql-server)
+[![Build Status](https://travis-ci.org/apollostack/graphql-server.svg?branch=master)](https://travis-ci.org/apollostack/graphql-server)
+[![Coverage Status](https://coveralls.io/repos/github/apollostack/graphql-server/badge.svg?branch=master)](https://coveralls.io/github/apollostack/graphql-server?branch=master)
 [![Get on Slack](https://img.shields.io/badge/slack-join-orange.svg)](http://www.apollostack.com/#slack)
 
-Apollo Server is a community-maintained open-source GraphQL server. It works with all Node.js HTTP server frameworks: Express, Connect, Hapi and Koa.
+GraphQL Server is a community-maintained open-source GraphQL server. It works with all Node.js HTTP server frameworks: Express, Connect, Hapi and Koa.
 
 ## Principles
 
-Apollo Server is built with the following principles in mind:
+GraphQL Server is built with the following principles in mind:
 
-* **By the community, for the community**: Apollo Server's development is driven by the needs of developers
-* **Simplicity**: by keeping things simple, Apollo Server is easier to use, easier to contribute to, and more secure
-* **Performance**: Apollo Server is well-tested and production-ready - no modifications needed
+* **By the community, for the community**: GraphQL Server's development is driven by the needs of developers
+* **Simplicity**: by keeping things simple, GraphQL Server is easier to use, easier to contribute to, and more secure
+* **Performance**: GraphQL Server is well-tested and production-ready - no modifications needed
 
 
-Anyone is welcome to contribute to Apollo Server, just read [CONTRIBUTING.md](./CONTRIBUTING.md), take a look at the [roadmap](./ROADMAP.md) and make your first PR!
+Anyone is welcome to contribute to GraphQL Server, just read [CONTRIBUTING.md](./CONTRIBUTING.md), take a look at the [roadmap](./ROADMAP.md) and make your first PR!
 
 
 ## Getting started
 
-Apollo Server is super-easy to set up. Just npm-install apollo-server, write a GraphQL schema, and then use one of the following snippets to get started. For more info, read the [Apollo Server docs](http://dev.apollodata.com/tools/apollo-server/index.html).
+GraphQL Server is super-easy to set up. Just npm-install graphql-server-<variant>, write a GraphQL schema, and then use one of the following snippets to get started. For more info, read the [GraphQL Server docs](http://dev.apollodata.com/tools/graphql-server/index.html).
 
 ### Installation
 
-Just run `npm install --save apollo-server-<variant>` and you're good to go!
+Just run `npm install --save graphql-server-<variant>` and you're good to go!
 
 where variant is one of the following:
  - express
@@ -36,7 +36,7 @@ where variant is one of the following:
 
 ```js
 import express from 'express';
-import { apolloExpress } from 'apollo-server-express';
+import { apolloExpress } from 'graphql-server-express';
 
 const myGraphQLSchema = // ... define or import your schema here!
 const PORT = 3000;
@@ -52,7 +52,7 @@ app.listen(PORT);
 ```js
 import connect from 'connect';
 import bodyParser from 'body-parser';
-import { apolloConnect } from 'apollo-server-express';
+import { apolloConnect } from 'graphql-server-express';
 import http from 'http';
 
 const PORT = 3000;
@@ -71,7 +71,7 @@ Now with the Hapi plugins `apolloHapi` and `graphiqlHapi` you can pass a route o
 
 ```js
 import hapi from 'hapi';
-import { apolloHapi } from 'apollo-server-hapi';
+import { apolloHapi } from 'graphql-server-hapi';
 
 const server = new hapi.Server();
 
@@ -108,7 +108,7 @@ server.start((err) => {
 ```js
 import koa from 'koa';
 import koaRouter from 'koa-router';
-import { apolloKoa } from 'apollo-server-koa';
+import { apolloKoa } from 'graphql-server-koa';
 
 const app = new koa();
 const router = new koaRouter();
@@ -124,7 +124,7 @@ app.listen(PORT);
 
 ## Options
 
-Apollo Server can be configured with an options object with the the following fields:
+GraphQL Server can be configured with an options object with the the following fields:
 
 * **schema**: the GraphQLSchema to be used
 * **context**: the context value passed to resolvers during GraphQL execution
@@ -154,39 +154,39 @@ apolloOptions = {
 
 ## Differences to express-graphql
 
-Apollo Server and express-graphql are more or less the same thing (GraphQL middleware for Node.js), but there are a few key differences:
+GraphQL Server and express-graphql are more or less the same thing (GraphQL middleware for Node.js), but there are a few key differences:
 
-* express-graphql works with Express and Connect, Apollo Server supports Express, Connect, Hapi and Koa.
-* express-graphql's main goal is to be a minimal reference implementation, whereas Apollo Server's goal is to be a complete production-ready GraphQL server.
-* Compared to express-graphql, Apollo Server has a simpler interface and supports exactly one way of passing queries.
-* Apollo Server separates serving GraphiQL (GraphQL UI) from responding to GraphQL requests.
-* express-graphql contains code for parsing HTTP request bodies, Apollo Server leaves that to standard packages like body-parser.
+* express-graphql works with Express and Connect, GraphQL Server supports Express, Connect, Hapi and Koa.
+* express-graphql's main goal is to be a minimal reference implementation, whereas GraphQL Server's goal is to be a complete production-ready GraphQL server.
+* Compared to express-graphql, GraphQL Server has a simpler interface and supports exactly one way of passing queries.
+* GraphQL Server separates serving GraphiQL (GraphQL UI) from responding to GraphQL requests.
+* express-graphql contains code for parsing HTTP request bodies, GraphQL Server leaves that to standard packages like body-parser.
 * Includes an `OperationStore` to easily manage whitelisting
 * Built with TypeScript
 
-Despite express-graphql being a reference implementation, Apollo Server is actually easier to understand and more modular than express-graphql.
+Despite express-graphql being a reference implementation, GraphQL Server is actually easier to understand and more modular than express-graphql.
 
-That said, Apollo Server is heavily inspired by express-graphql (it's the reference implementation after all). Rather than seeing the two as competing alternatives, we think that they both have separate roles in the GraphQL ecosystem: express-graphql is a reference implementation, and Apollo Server is a GraphQL server to be used in production and evolve quickly with the needs of the community. Over time, express-graphql can adopt those features of Apollo Server that have proven their worth and become established more widely.
+That said, GraphQL Server is heavily inspired by express-graphql (it's the reference implementation after all). Rather than seeing the two as competing alternatives, we think that they both have separate roles in the GraphQL ecosystem: express-graphql is a reference implementation, and GraphQL Server is a GraphQL server to be used in production and evolve quickly with the needs of the community. Over time, express-graphql can adopt those features of GraphQL Server that have proven their worth and become established more widely.
 
-## Apollo Server Development
+## GraphQL Server Development
 
 If you want to develop apollo server locally you must follow the following instructions:
 
 * Fork this repository
 
-* Install the Apollo Server project in your computer
+* Install the GraphQL Server project in your computer
 
 ```
-git clone https://github.com/[your-user]/apollo-server
-cd apollo-server
+git clone https://github.com/[your-user]/graphql-server
+cd graphql-server
 npm install
-cd packages/apollo-server-<variant>/
+cd packages/graphql-server-<variant>/
 npm link
 ```
 
-* Install your local Apollo Server in other App
+* Install your local GraphQL Server in other App
 
 ```
 cd ~/myApp
-npm link apollo-server
+npm link graphql-server-<variant>
 ```
diff --git a/integrations.md b/integrations.md
index 96d98007921..33c46485025 100644
--- a/integrations.md
+++ b/integrations.md
@@ -8,7 +8,7 @@ An Express Middleware for the Apollo Server
 import * as graphql from "graphql";
 import * as express from "express";
 import * as bodyParser from "body-parser";
-import { graphqlHTTP, renderGraphiQL } from "apollo-server";
+import { apolloExpress, graphiqlExpress } from "graphql-server-express";
 
 const port = 3000;
 const endpointURL = "/graphql";
@@ -24,8 +24,8 @@ const schema = new graphql.GraphQLSchema({
 });
 
 app.use(bodyParser.json());
-app.get("/", renderGraphiQL({endpointURL}));
-app.post(endpointURL, graphqlHTTP({schema}));
+app.get("/", graphiqlExpress({endpointURL}));
+app.post(endpointURL, apolloExpress({schema}));
 
 app.listen(port, () => {
     console.log(`Server is listen on ${port}`);
diff --git a/lerna.json b/lerna.json
index ff55a5bdb32..0bdc4521ff4 100644
--- a/lerna.json
+++ b/lerna.json
@@ -2,7 +2,7 @@
   "lerna": "2.0.0-beta.30",
   "version": "0.3.2",
   "changelog": {
-    "repo": "apollostack/apollo-server",
+    "repo": "apollostack/graphql-server",
     "labels": {
       "tag: spec compliancy": ":eyeglasses: Spec Compliancy",
       "tag: breaking change": ":boom: Breaking Change",
diff --git a/package.json b/package.json
index 2cbc208e493..100e2f2a867 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apollostack/apollo-server.git"
+    "url": "git+https://github.com/apollostack/graphql-server.git"
   },
   "scripts": {
     "compile": "lerna exec -- npm run compile",
diff --git a/packages/apollo-server-core/.npmignore b/packages/graphql-server-core/.npmignore
similarity index 100%
rename from packages/apollo-server-core/.npmignore
rename to packages/graphql-server-core/.npmignore
diff --git a/packages/apollo-server-core/package.json b/packages/graphql-server-core/package.json
similarity index 74%
rename from packages/apollo-server-core/package.json
rename to packages/graphql-server-core/package.json
index f3914cff707..f42e325d250 100644
--- a/packages/apollo-server-core/package.json
+++ b/packages/graphql-server-core/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "apollo-server-core",
+  "name": "graphql-server-core",
   "version": "0.3.2",
   "description": "Core engine ffor Apollo GraphQL server",
   "main": "dist/index.js",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-core"
+    "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-core"
   },
   "keywords": [
     "GraphQL",
@@ -20,9 +20,9 @@
   "author": "Jonas Helfer <jonas@helfer.email>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/apollostack/apollo-server/issues"
+    "url": "https://github.com/apollostack/graphql-server/issues"
   },
-  "homepage": "https://github.com/apollostack/apollo-server#readme",
+  "homepage": "https://github.com/apollostack/graphql-server#readme",
   "dependencies": {},
   "devDependencies": {
     "@types/fibers": "0.0.29",
diff --git a/packages/apollo-server-core/src/apolloOptions.ts b/packages/graphql-server-core/src/apolloOptions.ts
similarity index 100%
rename from packages/apollo-server-core/src/apolloOptions.ts
rename to packages/graphql-server-core/src/apolloOptions.ts
diff --git a/packages/apollo-server-core/src/index.ts b/packages/graphql-server-core/src/index.ts
similarity index 100%
rename from packages/apollo-server-core/src/index.ts
rename to packages/graphql-server-core/src/index.ts
diff --git a/packages/apollo-server-core/src/runQuery.test.ts b/packages/graphql-server-core/src/runQuery.test.ts
similarity index 100%
rename from packages/apollo-server-core/src/runQuery.test.ts
rename to packages/graphql-server-core/src/runQuery.test.ts
diff --git a/packages/apollo-server-core/src/runQuery.ts b/packages/graphql-server-core/src/runQuery.ts
similarity index 100%
rename from packages/apollo-server-core/src/runQuery.ts
rename to packages/graphql-server-core/src/runQuery.ts
diff --git a/packages/apollo-server-core/tsconfig.json b/packages/graphql-server-core/tsconfig.json
similarity index 100%
rename from packages/apollo-server-core/tsconfig.json
rename to packages/graphql-server-core/tsconfig.json
diff --git a/packages/apollo-server-express/.npmignore b/packages/graphql-server-express/.npmignore
similarity index 100%
rename from packages/apollo-server-express/.npmignore
rename to packages/graphql-server-express/.npmignore
diff --git a/packages/apollo-server-express/package.json b/packages/graphql-server-express/package.json
similarity index 70%
rename from packages/apollo-server-express/package.json
rename to packages/graphql-server-express/package.json
index bf86647acf7..097cd1f5ff1 100644
--- a/packages/apollo-server-express/package.json
+++ b/packages/graphql-server-express/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "apollo-server-express",
+  "name": "graphql-server-express",
   "version": "0.3.2",
   "description": "Production-ready Node.js GraphQL server for Express, Connect",
   "main": "dist/index.js",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-express"
+    "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-express"
   },
   "keywords": [
     "GraphQL",
@@ -22,19 +22,19 @@
   "author": "Jonas Helfer <jonas@helfer.email>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/apollostack/apollo-server/issues"
+    "url": "https://github.com/apollostack/graphql-server/issues"
   },
-  "homepage": "https://github.com/apollostack/apollo-server#readme",
+  "homepage": "https://github.com/apollostack/graphql-server#readme",
   "dependencies": {
-    "apollo-server-core": "^0.3.2",
-    "apollo-server-graphiql": "^0.3.2"
+    "graphql-server-core": "^0.3.2",
+    "graphql-server-module-graphiql": "^0.3.2"
   },
   "devDependencies": {
     "@types/body-parser": "0.0.33",
     "@types/connect": "^3.4.30",
     "@types/express": "^4.0.33",
     "@types/multer": "0.0.32",
-    "apollo-server-integration-testsuite": "^0.3.2",
+    "graphql-server-integration-testsuite": "^0.3.2",
     "body-parser": "^1.15.2",
     "connect": "^3.4.1",
     "express": "^4.14.0",
diff --git a/packages/apollo-server-express/src/apolloServerHttp.test.ts b/packages/graphql-server-express/src/apolloServerHttp.test.ts
similarity index 100%
rename from packages/apollo-server-express/src/apolloServerHttp.test.ts
rename to packages/graphql-server-express/src/apolloServerHttp.test.ts
diff --git a/packages/apollo-server-express/src/connectApollo.test.ts b/packages/graphql-server-express/src/connectApollo.test.ts
similarity index 87%
rename from packages/apollo-server-express/src/connectApollo.test.ts
rename to packages/graphql-server-express/src/connectApollo.test.ts
index b9db82941ec..3e7377a2779 100644
--- a/packages/apollo-server-express/src/connectApollo.test.ts
+++ b/packages/graphql-server-express/src/connectApollo.test.ts
@@ -3,7 +3,7 @@ import * as bodyParser from 'body-parser';
 import { apolloConnect, graphiqlConnect } from './connectApollo';
 import 'mocha';
 
-import testSuite, { Schema, CreateAppOptions } from 'apollo-server-integration-testsuite';
+import testSuite, { Schema, CreateAppOptions } from 'graphql-server-integration-testsuite';
 
 function createConnectApp(options: CreateAppOptions = {}) {
   const app = connect();
diff --git a/packages/apollo-server-express/src/connectApollo.ts b/packages/graphql-server-express/src/connectApollo.ts
similarity index 100%
rename from packages/apollo-server-express/src/connectApollo.ts
rename to packages/graphql-server-express/src/connectApollo.ts
diff --git a/packages/apollo-server-express/src/expressApollo.test.ts b/packages/graphql-server-express/src/expressApollo.test.ts
similarity index 88%
rename from packages/apollo-server-express/src/expressApollo.test.ts
rename to packages/graphql-server-express/src/expressApollo.test.ts
index c45afd577cf..cfcbf92b75c 100644
--- a/packages/apollo-server-express/src/expressApollo.test.ts
+++ b/packages/graphql-server-express/src/expressApollo.test.ts
@@ -1,9 +1,9 @@
 import * as express from 'express';
 import * as bodyParser from 'body-parser';
 import { apolloExpress, graphiqlExpress } from './expressApollo';
-import testSuite, { Schema, CreateAppOptions } from 'apollo-server-integration-testsuite';
+import testSuite, { Schema, CreateAppOptions } from 'graphql-server-integration-testsuite';
 import { expect } from 'chai';
-import { ApolloOptions } from 'apollo-server-core';
+import { ApolloOptions } from 'graphql-server-core';
 import 'mocha';
 
 function createApp(options: CreateAppOptions = {}) {
diff --git a/packages/apollo-server-express/src/expressApollo.ts b/packages/graphql-server-express/src/expressApollo.ts
similarity index 97%
rename from packages/apollo-server-express/src/expressApollo.ts
rename to packages/graphql-server-express/src/expressApollo.ts
index 1acd530cb4c..4bcb666eab1 100644
--- a/packages/apollo-server-express/src/expressApollo.ts
+++ b/packages/graphql-server-express/src/expressApollo.ts
@@ -1,8 +1,8 @@
 import * as express from 'express';
 import * as graphql from 'graphql';
 import * as url from 'url';
-import { ApolloOptions, runQuery } from 'apollo-server-core';
-import * as GraphiQL from 'apollo-server-graphiql';
+import { ApolloOptions, runQuery } from 'graphql-server-core';
+import * as GraphiQL from 'graphql-server-module-graphiql';
 
 export interface ExpressApolloOptionsFunction {
   (req?: express.Request, res?: express.Response): ApolloOptions | Promise<ApolloOptions>;
diff --git a/packages/apollo-server-express/src/index.ts b/packages/graphql-server-express/src/index.ts
similarity index 100%
rename from packages/apollo-server-express/src/index.ts
rename to packages/graphql-server-express/src/index.ts
diff --git a/packages/apollo-server-express/tsconfig.json b/packages/graphql-server-express/tsconfig.json
similarity index 100%
rename from packages/apollo-server-express/tsconfig.json
rename to packages/graphql-server-express/tsconfig.json
diff --git a/packages/apollo-server-graphiql/.npmignore b/packages/graphql-server-hapi/.npmignore
similarity index 100%
rename from packages/apollo-server-graphiql/.npmignore
rename to packages/graphql-server-hapi/.npmignore
diff --git a/packages/apollo-server-hapi/package.json b/packages/graphql-server-hapi/package.json
similarity index 67%
rename from packages/apollo-server-hapi/package.json
rename to packages/graphql-server-hapi/package.json
index fbd523c1ef3..c9f3c202929 100644
--- a/packages/apollo-server-hapi/package.json
+++ b/packages/graphql-server-hapi/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "apollo-server-hapi",
+  "name": "graphql-server-hapi",
   "version": "0.3.2",
   "description": "Production-ready Node.js GraphQL server for Hapi",
   "main": "dist/index.js",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-hapi"
+    "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-hapi"
   },
   "keywords": [
     "GraphQL",
@@ -21,18 +21,18 @@
   "author": "Jonas Helfer <jonas@helfer.email>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/apollostack/apollo-server/issues"
+    "url": "https://github.com/apollostack/graphql-server/issues"
   },
-  "homepage": "https://github.com/apollostack/apollo-server#readme",
+  "homepage": "https://github.com/apollostack/graphql-server#readme",
   "dependencies": {
-    "apollo-server-core": "^0.3.2",
-    "apollo-server-graphiql": "^0.3.2",
+    "graphql-server-core": "^0.3.2",
+    "graphql-server-module-graphiql": "^0.3.2",
     "boom": "^4.0.0"
   },
   "devDependencies": {
     "@types/boom": "0.0.32",
     "@types/hapi": "^13.0.35",
-    "apollo-server-integration-testsuite": "^0.3.2",
+    "graphql-server-integration-testsuite": "^0.3.2",
     "hapi": "^15.0.3",
     "typed-graphql": "^1.0.2"
   },
diff --git a/packages/apollo-server-hapi/src/hapiApollo.test.ts b/packages/graphql-server-hapi/src/hapiApollo.test.ts
similarity index 91%
rename from packages/apollo-server-hapi/src/hapiApollo.test.ts
rename to packages/graphql-server-hapi/src/hapiApollo.test.ts
index 29f99a38ebf..5ca2ed76103 100644
--- a/packages/apollo-server-hapi/src/hapiApollo.test.ts
+++ b/packages/graphql-server-hapi/src/hapiApollo.test.ts
@@ -2,7 +2,7 @@ import * as hapi from 'hapi';
 import { apolloHapi, graphiqlHapi, HapiPluginOptions } from './hapiApollo';
 import 'mocha';
 
-import testSuite, { Schema } from 'apollo-server-integration-testsuite';
+import testSuite, { Schema } from 'graphql-server-integration-testsuite';
 
 function createApp(createOptions: HapiPluginOptions) {
   const server = new hapi.Server();
diff --git a/packages/apollo-server-hapi/src/hapiApollo.ts b/packages/graphql-server-hapi/src/hapiApollo.ts
similarity index 98%
rename from packages/apollo-server-hapi/src/hapiApollo.ts
rename to packages/graphql-server-hapi/src/hapiApollo.ts
index 0beaa36f7dc..6334fb5d8d0 100644
--- a/packages/apollo-server-hapi/src/hapiApollo.ts
+++ b/packages/graphql-server-hapi/src/hapiApollo.ts
@@ -1,8 +1,8 @@
 import * as Boom from 'boom';
 import { Server, Request, IReply } from 'hapi';
 import { GraphQLResult, formatError } from 'graphql';
-import * as GraphiQL from 'apollo-server-graphiql';
-import { ApolloOptions, runQuery } from 'apollo-server-core';
+import * as GraphiQL from 'graphql-server-module-graphiql';
+import { ApolloOptions, runQuery } from 'graphql-server-core';
 
 export interface IRegister {
     (server: Server, options: any, next: any): void;
diff --git a/packages/apollo-server-hapi/src/index.ts b/packages/graphql-server-hapi/src/index.ts
similarity index 100%
rename from packages/apollo-server-hapi/src/index.ts
rename to packages/graphql-server-hapi/src/index.ts
diff --git a/packages/apollo-server-hapi/tsconfig.json b/packages/graphql-server-hapi/tsconfig.json
similarity index 100%
rename from packages/apollo-server-hapi/tsconfig.json
rename to packages/graphql-server-hapi/tsconfig.json
diff --git a/packages/apollo-server-hapi/.npmignore b/packages/graphql-server-integration-testsuite/.npmignore
similarity index 100%
rename from packages/apollo-server-hapi/.npmignore
rename to packages/graphql-server-integration-testsuite/.npmignore
diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/graphql-server-integration-testsuite/package.json
similarity index 61%
rename from packages/apollo-server-integration-testsuite/package.json
rename to packages/graphql-server-integration-testsuite/package.json
index d72e95028e6..07b4350c364 100644
--- a/packages/apollo-server-integration-testsuite/package.json
+++ b/packages/graphql-server-integration-testsuite/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "apollo-server-integration-testsuite",
+  "name": "graphql-server-integration-testsuite",
   "private": true,
   "version": "0.3.2",
   "description": "Apollo Server Integrations testsuite",
@@ -10,19 +10,19 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-integration-testsuite"
+    "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-integration-testsuite"
   },
   "keywords": [],
   "author": "Jonas Helfer <jonas@helfer.email>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/apollostack/apollo-server/issues"
+    "url": "https://github.com/apollostack/graphql-server/issues"
   },
-  "homepage": "https://github.com/apollostack/apollo-server#readme",
+  "homepage": "https://github.com/apollostack/graphql-server#readme",
   "dependencies": {
-    "apollo-server-core": "^0.3.2",
-    "apollo-server-graphiql": "^0.3.2",
-    "apollo-server-operation-store": "^0.3.2",
+    "graphql-server-core": "^0.3.2",
+    "graphql-server-module-graphiql": "^0.3.2",
+    "graphql-server-module-operation-store": "^0.3.2",
     "supertest": "^2.0.0",
     "supertest-as-promised": "^4.0.0"
   },
diff --git a/packages/apollo-server-integration-testsuite/src/index.ts b/packages/graphql-server-integration-testsuite/src/index.ts
similarity index 99%
rename from packages/apollo-server-integration-testsuite/src/index.ts
rename to packages/graphql-server-integration-testsuite/src/index.ts
index 861c0f830a8..bc026ca0100 100644
--- a/packages/apollo-server-integration-testsuite/src/index.ts
+++ b/packages/graphql-server-integration-testsuite/src/index.ts
@@ -14,9 +14,9 @@ import {
 // tslint:disable-next-line
 const request = require('supertest-as-promised');
 
-import { ApolloOptions } from 'apollo-server-core';
-import * as GraphiQL from 'apollo-server-graphiql';
-import { OperationStore } from 'apollo-server-operation-store';
+import { ApolloOptions } from 'graphql-server-core';
+import * as GraphiQL from 'graphql-server-module-graphiql';
+import { OperationStore } from 'graphql-server-module-operation-store';
 
 const QueryType = new GraphQLObjectType({
     name: 'QueryType',
diff --git a/packages/apollo-server-integration-testsuite/tsconfig.json b/packages/graphql-server-integration-testsuite/tsconfig.json
similarity index 100%
rename from packages/apollo-server-integration-testsuite/tsconfig.json
rename to packages/graphql-server-integration-testsuite/tsconfig.json
diff --git a/packages/apollo-server-integration-testsuite/.npmignore b/packages/graphql-server-koa/.npmignore
similarity index 100%
rename from packages/apollo-server-integration-testsuite/.npmignore
rename to packages/graphql-server-koa/.npmignore
diff --git a/packages/apollo-server-koa/package.json b/packages/graphql-server-koa/package.json
similarity index 69%
rename from packages/apollo-server-koa/package.json
rename to packages/graphql-server-koa/package.json
index 5339621b45c..175f383ca9c 100644
--- a/packages/apollo-server-koa/package.json
+++ b/packages/graphql-server-koa/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "apollo-server-koa",
+  "name": "graphql-server-koa",
   "version": "0.3.2",
   "description": "Production-ready Node.js GraphQL server for Koa",
   "main": "dist/index.js",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-koa"
+    "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-koa"
   },
   "keywords": [
     "GraphQL",
@@ -21,18 +21,18 @@
   "author": "Jonas Helfer <jonas@helfer.email>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/apollostack/apollo-server/issues"
+    "url": "https://github.com/apollostack/graphql-server/issues"
   },
-  "homepage": "https://github.com/apollostack/apollo-server#readme",
+  "homepage": "https://github.com/apollostack/graphql-server#readme",
   "dependencies": {
-    "apollo-server-core": "^0.3.2",
-    "apollo-server-graphiql": "^0.3.2"
+    "graphql-server-core": "^0.3.2",
+    "graphql-server-module-graphiql": "^0.3.2"
   },
   "devDependencies": {
     "@types/koa": "^2.0.33",
     "@types/koa-bodyparser": "^3.0.19",
     "@types/koa-router": "^7.0.21",
-    "apollo-server-integration-testsuite": "^0.3.2",
+    "graphql-server-integration-testsuite": "^0.3.2",
     "koa": "^2.0.0-alpha.4",
     "koa-bodyparser": "^3.0.0",
     "koa-router": "^7.0.1",
diff --git a/packages/apollo-server-koa/src/index.ts b/packages/graphql-server-koa/src/index.ts
similarity index 100%
rename from packages/apollo-server-koa/src/index.ts
rename to packages/graphql-server-koa/src/index.ts
diff --git a/packages/apollo-server-koa/src/koaApollo.test.ts b/packages/graphql-server-koa/src/koaApollo.test.ts
similarity index 89%
rename from packages/apollo-server-koa/src/koaApollo.test.ts
rename to packages/graphql-server-koa/src/koaApollo.test.ts
index 16a3e3bca82..a4d024199a6 100644
--- a/packages/apollo-server-koa/src/koaApollo.test.ts
+++ b/packages/graphql-server-koa/src/koaApollo.test.ts
@@ -2,11 +2,11 @@ import * as koa from 'koa';
 import * as koaRouter from 'koa-router';
 import * as koaBody from 'koa-bodyparser';
 import { apolloKoa, graphiqlKoa } from './koaApollo';
-import { ApolloOptions } from 'apollo-server-core';
+import { ApolloOptions } from 'graphql-server-core';
 import { expect } from 'chai';
 import * as http from 'http';
 
-import testSuite, { Schema, CreateAppOptions } from 'apollo-server-integration-testsuite';
+import testSuite, { Schema, CreateAppOptions } from 'graphql-server-integration-testsuite';
 
 function createApp(options: CreateAppOptions = {}) {
   const app = new koa();
diff --git a/packages/apollo-server-koa/src/koaApollo.ts b/packages/graphql-server-koa/src/koaApollo.ts
similarity index 96%
rename from packages/apollo-server-koa/src/koaApollo.ts
rename to packages/graphql-server-koa/src/koaApollo.ts
index a6416457c6a..a1016a31b18 100644
--- a/packages/apollo-server-koa/src/koaApollo.ts
+++ b/packages/graphql-server-koa/src/koaApollo.ts
@@ -1,7 +1,7 @@
 import * as koa from 'koa';
 import * as graphql from 'graphql';
-import { ApolloOptions, runQuery } from 'apollo-server-core';
-import * as GraphiQL from 'apollo-server-graphiql';
+import { ApolloOptions, runQuery } from 'graphql-server-core';
+import * as GraphiQL from 'graphql-server-module-graphiql';
 
 export interface KoaApolloOptionsFunction {
   (ctx: koa.Context): ApolloOptions | Promise<ApolloOptions>;
diff --git a/packages/apollo-server-koa/tsconfig.json b/packages/graphql-server-koa/tsconfig.json
similarity index 100%
rename from packages/apollo-server-koa/tsconfig.json
rename to packages/graphql-server-koa/tsconfig.json
diff --git a/packages/apollo-server-koa/.npmignore b/packages/graphql-server-module-graphiql/.npmignore
similarity index 100%
rename from packages/apollo-server-koa/.npmignore
rename to packages/graphql-server-module-graphiql/.npmignore
diff --git a/packages/apollo-server-graphiql/package.json b/packages/graphql-server-module-graphiql/package.json
similarity index 65%
rename from packages/apollo-server-graphiql/package.json
rename to packages/graphql-server-module-graphiql/package.json
index 7e878fb8efa..f712d70a398 100644
--- a/packages/apollo-server-graphiql/package.json
+++ b/packages/graphql-server-module-graphiql/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "apollo-server-graphiql",
+  "name": "graphql-server-module-graphiql",
   "version": "0.3.2",
   "description": "GraphiQL renderer for Apollo GraphQL Server",
   "main": "dist/index.js",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-graphiql"
+    "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-module-graphiql"
   },
   "keywords": [
     "GraphQL",
@@ -20,9 +20,9 @@
   "author": "Jonas Helfer <jonas@helfer.email>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/apollostack/apollo-server/issues"
+    "url": "https://github.com/apollostack/graphql-server/issues"
   },
-  "homepage": "https://github.com/apollostack/apollo-server#readme",
+  "homepage": "https://github.com/apollostack/graphql-server#readme",
   "dependencies": {},
   "devDependencies": {},
   "typings": "dist/index.d.ts",
diff --git a/packages/apollo-server-graphiql/src/index.ts b/packages/graphql-server-module-graphiql/src/index.ts
similarity index 100%
rename from packages/apollo-server-graphiql/src/index.ts
rename to packages/graphql-server-module-graphiql/src/index.ts
diff --git a/packages/apollo-server-graphiql/src/renderGraphiQL.ts b/packages/graphql-server-module-graphiql/src/renderGraphiQL.ts
similarity index 100%
rename from packages/apollo-server-graphiql/src/renderGraphiQL.ts
rename to packages/graphql-server-module-graphiql/src/renderGraphiQL.ts
diff --git a/packages/apollo-server-graphiql/tsconfig.json b/packages/graphql-server-module-graphiql/tsconfig.json
similarity index 100%
rename from packages/apollo-server-graphiql/tsconfig.json
rename to packages/graphql-server-module-graphiql/tsconfig.json
diff --git a/packages/apollo-server-operation-store/.npmignore b/packages/graphql-server-module-operation-store/.npmignore
similarity index 100%
rename from packages/apollo-server-operation-store/.npmignore
rename to packages/graphql-server-module-operation-store/.npmignore
diff --git a/packages/apollo-server-operation-store/package.json b/packages/graphql-server-module-operation-store/package.json
similarity index 70%
rename from packages/apollo-server-operation-store/package.json
rename to packages/graphql-server-module-operation-store/package.json
index 4d6aba1d3e1..ed17d440d16 100644
--- a/packages/apollo-server-operation-store/package.json
+++ b/packages/graphql-server-module-operation-store/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "apollo-server-operation-store",
+  "name": "graphql-server-module-operation-store",
   "version": "0.3.2",
   "description": "Operation-Store module of apollo GraphQL Server",
   "main": "dist/index.js",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/apollostack/apollo-server/tree/master/packages/apollo-server-operation-store"
+    "url": "https://github.com/apollostack/graphql-server/tree/master/packages/graphql-server-module-operation-store"
   },
   "keywords": [
     "GraphQL",
@@ -20,9 +20,9 @@
   "author": "Jonas Helfer <jonas@helfer.email>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/apollostack/apollo-server/issues"
+    "url": "https://github.com/apollostack/graphql-server/issues"
   },
-  "homepage": "https://github.com/apollostack/apollo-server#readme",
+  "homepage": "https://github.com/apollostack/graphql-server#readme",
   "dependencies": {},
   "devDependencies": {
     "typed-graphql": "^1.0.2"
diff --git a/packages/apollo-server-operation-store/src/index.ts b/packages/graphql-server-module-operation-store/src/index.ts
similarity index 100%
rename from packages/apollo-server-operation-store/src/index.ts
rename to packages/graphql-server-module-operation-store/src/index.ts
diff --git a/packages/apollo-server-operation-store/src/operationStore.test.ts b/packages/graphql-server-module-operation-store/src/operationStore.test.ts
similarity index 100%
rename from packages/apollo-server-operation-store/src/operationStore.test.ts
rename to packages/graphql-server-module-operation-store/src/operationStore.test.ts
diff --git a/packages/apollo-server-operation-store/src/operationStore.ts b/packages/graphql-server-module-operation-store/src/operationStore.ts
similarity index 100%
rename from packages/apollo-server-operation-store/src/operationStore.ts
rename to packages/graphql-server-module-operation-store/src/operationStore.ts
diff --git a/packages/apollo-server-operation-store/tsconfig.json b/packages/graphql-server-module-operation-store/tsconfig.json
similarity index 100%
rename from packages/apollo-server-operation-store/tsconfig.json
rename to packages/graphql-server-module-operation-store/tsconfig.json
diff --git a/test/tests.js b/test/tests.js
index 1102f1ffb88..be146790761 100644
--- a/test/tests.js
+++ b/test/tests.js
@@ -4,10 +4,10 @@ require('babel-polyfill');
 process.env.NODE_ENV = 'test';
 
 require('source-map-support').install();
-require('../packages/apollo-server-core/dist/runQuery.test.js');
-require('../packages/apollo-server-operation-store/dist/operationStore.test');
-require('../packages/apollo-server-express/dist/expressApollo.test');
-require('../packages/apollo-server-express/dist/connectApollo.test');
-require('../packages/apollo-server-hapi/dist/hapiApollo.test');
-require('../packages/apollo-server-koa/dist/koaApollo.test');
-require('../packages/apollo-server-express/dist/apolloServerHttp.test');
+require('../packages/graphql-server-core/dist/runQuery.test.js');
+require('../packages/graphql-server-module-operation-store/dist/operationStore.test');
+require('../packages/graphql-server-express/dist/expressApollo.test');
+require('../packages/graphql-server-express/dist/connectApollo.test');
+require('../packages/graphql-server-hapi/dist/hapiApollo.test');
+require('../packages/graphql-server-koa/dist/koaApollo.test');
+require('../packages/graphql-server-express/dist/apolloServerHttp.test');