From c8015453b5836157aef4efff1c7471372297ace2 Mon Sep 17 00:00:00 2001
From: Basarat Ali Syed <basaratali@gmail.com>
Date: Sat, 5 Jul 2014 21:06:34 +1000
Subject: [PATCH 1/4] Update es6-promises.d.ts

---
 es6-promises/es6-promises.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/es6-promises/es6-promises.d.ts b/es6-promises/es6-promises.d.ts
index 34ee4fae2e..6322768225 100644
--- a/es6-promises/es6-promises.d.ts
+++ b/es6-promises/es6-promises.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for es6-promises
-// Project: https://github.com/jakearchibald/ES6-Promises
+// Type definitions for es6-promise
+// Project: https://github.com/jakearchibald/ES6-Promise
 // Definitions by: François de Campredon <https://github.com/fdecampredon/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
@@ -132,10 +132,10 @@ declare module Promise {
 	function race<R>(promises: Promise<R>[]): Promise<R>;
 }
 
-declare module 'es6-promises' {
+declare module 'es6-promise' {
     var foo: typeof Promise; // Temp variable to reference Promise in local context
     module rsvp {
         export var Promise: typeof foo;
     }
     export = rsvp;
-}
\ No newline at end of file
+}

From eeea727f5a2c927c7c52db3ae4229dd1a3b59869 Mon Sep 17 00:00:00 2001
From: Basarat Ali Syed <basaratali@gmail.com>
Date: Sat, 5 Jul 2014 21:06:52 +1000
Subject: [PATCH 2/4] Update es6-promises-commonjs-tests.ts

---
 es6-promises/es6-promises-commonjs-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/es6-promises/es6-promises-commonjs-tests.ts b/es6-promises/es6-promises-commonjs-tests.ts
index 70e35c5948..688dd3c2f0 100644
--- a/es6-promises/es6-promises-commonjs-tests.ts
+++ b/es6-promises/es6-promises-commonjs-tests.ts
@@ -1,6 +1,6 @@
 /// <reference path="es6-promises.d.ts" />
 
-import rsvp = require('es6-promises');
+import rsvp = require('es6-promise');
 var Promise = rsvp.Promise;
 
 var promiseString: Promise<string>,

From ceda8851c9c0b3cff4c50a871f4c2b26ae033ad5 Mon Sep 17 00:00:00 2001
From: basarat <basaratali@gmail.com>
Date: Sat, 5 Jul 2014 21:11:49 +1000
Subject: [PATCH 3/4] chore(es6-promise) rename files/folder to match the npm
 name

---
 .../es6-promise-commonjs-tests.ts                               | 2 +-
 .../es6-promises-tests.ts => es6-promise/es6-promise-tests.ts   | 2 +-
 es6-promises/es6-promises.d.ts => es6-promise/es6-promise.d.ts  | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename es6-promises/es6-promises-commonjs-tests.ts => es6-promise/es6-promise-commonjs-tests.ts (99%)
 rename es6-promises/es6-promises-tests.ts => es6-promise/es6-promise-tests.ts (99%)
 rename es6-promises/es6-promises.d.ts => es6-promise/es6-promise.d.ts (100%)

diff --git a/es6-promises/es6-promises-commonjs-tests.ts b/es6-promise/es6-promise-commonjs-tests.ts
similarity index 99%
rename from es6-promises/es6-promises-commonjs-tests.ts
rename to es6-promise/es6-promise-commonjs-tests.ts
index 688dd3c2f0..4bcb4d0570 100644
--- a/es6-promises/es6-promises-commonjs-tests.ts
+++ b/es6-promise/es6-promise-commonjs-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="es6-promises.d.ts" />
+/// <reference path="es6-promise.d.ts" />
 
 import rsvp = require('es6-promise');
 var Promise = rsvp.Promise;
diff --git a/es6-promises/es6-promises-tests.ts b/es6-promise/es6-promise-tests.ts
similarity index 99%
rename from es6-promises/es6-promises-tests.ts
rename to es6-promise/es6-promise-tests.ts
index 774d3763e4..5495273722 100644
--- a/es6-promises/es6-promises-tests.ts
+++ b/es6-promise/es6-promise-tests.ts
@@ -1,4 +1,4 @@
-/// <reference path="es6-promises.d.ts" />
+/// <reference path="es6-promise.d.ts" />
 
 
 var promiseString: Promise<string>,
diff --git a/es6-promises/es6-promises.d.ts b/es6-promise/es6-promise.d.ts
similarity index 100%
rename from es6-promises/es6-promises.d.ts
rename to es6-promise/es6-promise.d.ts

From c532d8da2bf656d3de7277a6001c6cc7695b0196 Mon Sep 17 00:00:00 2001
From: basarat <basaratali@gmail.com>
Date: Sat, 5 Jul 2014 21:15:43 +1000
Subject: [PATCH 4/4] fix tests

---
 promises-a-plus/promises-a-plus-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/promises-a-plus/promises-a-plus-tests.ts b/promises-a-plus/promises-a-plus-tests.ts
index 29ca0989bf..042c4f0661 100644
--- a/promises-a-plus/promises-a-plus-tests.ts
+++ b/promises-a-plus/promises-a-plus-tests.ts
@@ -1,6 +1,6 @@
 /// <reference path="promises-a-plus.d.ts"/>
 /// <reference path="../rx.js/rx.async.d.ts"/>
-/// <reference path="../es6-promises/es6-promises.d.ts"/>
+/// <reference path="../es6-promise/es6-promise.d.ts"/>
 /// <reference path="../q/Q.d.ts"/>
 import When = require("../when/when");