diff --git a/on-finished/on-finished-tests.ts b/on-finished/on-finished-tests.ts
index 455ee2923e..c3956ac6b0 100644
--- a/on-finished/on-finished-tests.ts
+++ b/on-finished/on-finished-tests.ts
@@ -2,15 +2,15 @@
 /// <reference path="./on-finished.d.ts" />
 
 import events = require('events');
-import OnFinished = require('on-finished');
+import onFinished = require('on-finished');
 
 function test_finished() {
 
 	var e = new events.EventEmitter();
 
-	var ret: NodeJS.EventEmitter = OnFinished.onFinished(e, () => {
+	var ret: NodeJS.EventEmitter = onFinished(e, () => {
 		//callback
 		});
 
-	var finished: boolean = OnFinished.isFinished(e);
+	var finished: boolean = onFinished.isFinished(e);
 }
diff --git a/on-finished/on-finished.d.ts b/on-finished/on-finished.d.ts
index b595b9012e..0ca4f22865 100644
--- a/on-finished/on-finished.d.ts
+++ b/on-finished/on-finished.d.ts
@@ -5,8 +5,14 @@
 
 /// <reference path="../node/node.d.ts" />
 
+
 declare module 'on-finished' {
 
-    export function onFinished(msg:NodeJS.EventEmitter, listener:Function): NodeJS.EventEmitter;
-    export function isFinished(msg:NodeJS.EventEmitter):boolean;
+    function onFinished(msg:NodeJS.EventEmitter, listener:Function): NodeJS.EventEmitter;
+
+    module onFinished {
+        export function isFinished(msg:NodeJS.EventEmitter):boolean;
+    }
+
+    export = onFinished;
 }