diff --git a/public/index.php b/public/index.php
index caf0a4cc..e3d175eb 100644
--- a/public/index.php
+++ b/public/index.php
@@ -138,7 +138,7 @@
 // --------------------------------------------------------------
 // Execute the global "before" filter.
 // --------------------------------------------------------------
-$response = System\Route\Filter::call('before', array(), true);
+$response = System\Route_Filter::call('before', array(), true);
 
 // ----------------------------------------------------------
 // Execute the route function.
@@ -157,7 +157,7 @@
 // ----------------------------------------------------------
 // Execute the global "after" filter.
 // ----------------------------------------------------------
-System\Route\Filter::call('after', array($response));
+System\Route_Filter::call('after', array($response));
 
 // ----------------------------------------------------------
 // Stringify the response.
diff --git a/system/route.php b/system/route.php
index 62ce1cce..f078e848 100644
--- a/system/route.php
+++ b/system/route.php
@@ -55,7 +55,7 @@ public function call()
 		}
 		elseif (is_array($this->callback))
 		{
-			$response = isset($this->callback['before']) ? Route\Filter::call($this->callback['before'], array(), true) : null;
+			$response = isset($this->callback['before']) ? Route_Filter::call($this->callback['before'], array(), true) : null;
 
 			if (is_null($response) and isset($this->callback['do']))
 			{
@@ -67,7 +67,7 @@ public function call()
 
 		if (is_array($this->callback) and isset($this->callback['after']))
 		{
-			Route\Filter::call($this->callback['after'], array($response));
+			Route_Filter::call($this->callback['after'], array($response));
 		}
 
 		return $response;
diff --git a/system/route/filter.php b/system/route_filter.php
similarity index 94%
rename from system/route/filter.php
rename to system/route_filter.php
index 2118595e..5fd9e10c 100644
--- a/system/route/filter.php
+++ b/system/route_filter.php
@@ -1,6 +1,6 @@
-<?php namespace System\Route;
+<?php namespace System;
 
-class Filter {
+class Route_Filter {
 
 	/**
 	 * The loaded route filters.
diff --git a/system/route/finder.php b/system/route_finder.php
similarity index 97%
rename from system/route/finder.php
rename to system/route_finder.php
index a19eff93..75a54e39 100644
--- a/system/route/finder.php
+++ b/system/route_finder.php
@@ -1,6 +1,6 @@
-<?php namespace System\Route;
+<?php namespace System;
 
-class Finder {
+class Route_Finder {
 
 	/**
 	 * All of the loaded routes.
diff --git a/system/url.php b/system/url.php
index 3f5e5761..c5d52020 100644
--- a/system/url.php
+++ b/system/url.php
@@ -71,7 +71,7 @@ public static function to_asset($url)
 	 */
 	public static function to_route($name, $parameters = array(), $https = false)
 	{
-		if ( ! is_null($route = Route\Finder::find($name)))
+		if ( ! is_null($route = Route_Finder::find($name)))
 		{
 			$uris = explode(', ', key($route));
 
@@ -109,7 +109,7 @@ public static function to_secure_route($name, $parameters = array())
 	 */
 	public static function slug($title, $separator = '-')
 	{
-		$title = html_entity_decode(Str::ascii($title), ENT_QUOTES, Config::get('application.encoding'));
+		$title = Str::ascii($title);
 
 		// Remove all characters that are not the separator, letters, numbers, or whitespace.
 		$title = preg_replace('![^'.preg_quote($separator).'\pL\pN\s]+!u', '', Str::lower($title));