diff --git a/system/asset.php b/system/asset.php
index bbd3a92a..b09cc0b7 100644
--- a/system/asset.php
+++ b/system/asset.php
@@ -19,7 +19,7 @@ class Asset {
 	{
 		if ( ! isset(static::$containers[$container]))
 		{
-			static::$containers[$container] = new Asset\Container($container);
+			static::$containers[$container] = new Asset_Container($container);
 		}
 
 		return static::$containers[$container];
diff --git a/system/asset/container.php b/system/asset_container.php
similarity index 99%
rename from system/asset/container.php
rename to system/asset_container.php
index be0528bf..fe6a71d1 100644
--- a/system/asset/container.php
+++ b/system/asset_container.php
@@ -1,8 +1,8 @@
-<?php namespace System\Asset;
+<?php namespace System;
 
 use System\HTML;
 
-class Container {
+class Asset_Container {
 
 	/**
 	 * The asset container name.