diff --git a/composer.json b/composer.json
index 863cbcd..687ab73 100755
--- a/composer.json
+++ b/composer.json
@@ -1,24 +1,20 @@
 {
-	"name": "khill/durations",
-	"description": "Converts between colon formatted time, human-readable time and seconds.",
-	"keywords": ["durations", "time", "convert"],
-	"license": "MIT",
+    "name": "khill/php-duration",
+    "description": "Converts between colon formatted time, human-readable time and seconds",
+    "license": "MIT",
     "authors": [
         {
-            "name" : "Kevin Hill",
-            "email": "kevinkhill@gmail.com",
-            "role" : "Developer"
+            "name": "Kevin Hill",
+            "email": "kevinkhill@gmail.com"
         }
     ],
-	"require": {
-		"php": ">=5.3.0"
-	},
-	"require-dev" : {
-		"phpunit/phpunit": "4.5.*"
-	},
-	"autoload": {
-		"psr-4": {
-			"Khill\\Durations\\" : "src"
-		}
-	}
+    "require-dev": {
+        "phpunit/phpunit": "~4.5"
+    },
+    "autoload": {
+        "psr-4": {
+            "Khill\\Duration\\": "src/"
+        }
+    },
+    "minimum-stability": "stable"
 }
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100755
index 0000000..ea2d8fd
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit bootstrap="./vendor/autoload.php"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         strict="true"
+         syntaxCheck="true"
+         verbose="true"
+         colors="true"
+>
+  <testsuites>
+    <testsuite name="Package Test Suite">
+      <directory suffix=".php">test/</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>
diff --git a/src/Durations.php b/src/Duration.php
similarity index 98%
rename from src/Durations.php
rename to src/Duration.php
index 8b70c40..585d6c7 100755
--- a/src/Durations.php
+++ b/src/Duration.php
@@ -1,6 +1,6 @@
-<?php namespace Khill;
+<?php namespace Khill\Duration;
 
-class Durations {
+class Duration {
 
     public $hours;
     public $minutes;
diff --git a/tests/DurationsTest.php b/test/DurationTest.php
similarity index 97%
rename from tests/DurationsTest.php
rename to test/DurationTest.php
index 35d7283..a043233 100755
--- a/tests/DurationsTest.php
+++ b/test/DurationTest.php
@@ -1,14 +1,14 @@
 <?php
 
-use Khill\Durations;
+use Khill\Duration\Duration;
 
-class DurationsTest extends Phpunit_Framework_TestCase {
+class DurationTest extends PHPUnit_Framework_TestCase {
 
     public function setUp()
     {
         parent::setUp();
 
-        $this->d = new Durations;
+        $this->d = new Duration;
     }
 
     public function secondsSampleData()