diff --git a/classes/controller/devtools.php b/classes/Controller/Devtools.php
similarity index 96%
rename from classes/controller/devtools.php
rename to classes/Controller/Devtools.php
index 8119e6a..6ff72f6 100644
--- a/classes/controller/devtools.php
+++ b/classes/Controller/Devtools.php
@@ -1,6 +1,6 @@
 <?php defined('SYSPATH') or die('No direct script access.');
 
-class Controller_devtools extends Controller {
+class Controller_Devtools extends Controller {
 
 	public $template;
 
@@ -43,7 +43,7 @@ public function action_routetest()
 		if ( ! $url)
 		{
 			// Try to find a config file
-			$url = Kohana::config('route-test');
+			$url = Kohana::$config->load('route-test');
 		}
 		$this->template->content = View::factory('devtools/route-test',array(
 			// Get all the tests
diff --git a/classes/devtools/route.php b/classes/Devtools/Route.php
similarity index 100%
rename from classes/devtools/route.php
rename to classes/Devtools/Route.php
diff --git a/classes/devtools/route/tester.php b/classes/Devtools/Route/Tester.php
similarity index 96%
rename from classes/devtools/route/tester.php
rename to classes/Devtools/Route/Tester.php
index ce7b3f7..83d7c66 100644
--- a/classes/devtools/route/tester.php
+++ b/classes/Devtools/Route/Tester.php
@@ -52,7 +52,7 @@ public static function create_tests($tests)
 			// Test each route, and save the route and params if it matches
 			foreach (Route::all() as $route)
 			{
-				if ($current->params = $route->matches($current->url))
+				if ($current->params = $route->matches(Request::factory($current->url)))
 				{
 					$current->route = Route::name($route);
 					$current->params = array_merge(array('route'=>$current->route),$current->params);
diff --git a/classes/route.php b/classes/Route.php
similarity index 100%
rename from classes/route.php
rename to classes/Route.php
diff --git a/classes/route/tester.php b/classes/Route/Tester.php
similarity index 100%
rename from classes/route/tester.php
rename to classes/Route/Tester.php
diff --git a/views/devtools/config.php b/views/devtools/config.php
index 96b03c1..bbd80d5 100644
--- a/views/devtools/config.php
+++ b/views/devtools/config.php
@@ -8,7 +8,7 @@
 	
 	try
 	{
-		echo Debug::dump(Kohana::config($name));
+		echo Debug::dump(Kohana::$config->load($name));
 	}
 	catch (exception $e)
 	{
diff --git a/views/devtools/template.php b/views/devtools/template.php
index 7804e20..fc1fe9a 100644
--- a/views/devtools/template.php
+++ b/views/devtools/template.php
@@ -171,13 +171,13 @@
 		<div id="menu">
 			<h2>devtools<br /><small> by bluehawk</small></h3>
 			<ul>
-				<li><?php echo html::anchor(Route::get('devtools')->uri(array('action'=>'info')),'Kohana info',array('class'=>($action=='info'?'active':''))) ?></li>
-				<li><?php echo html::anchor(Route::get('devtools')->uri(array('action'=>'extension')),'Transparent extension',array('class'=>($action=='extension'?'active':''))) ?></li>
-				<li><?php echo html::anchor(Route::get('devtools')->uri(array('action'=>'routetest')),'Route tester',array('class'=>($action=='routetest'?'active':''))) ?></li>
-				<li><?php echo html::anchor(Route::get('devtools')->uri(array('action'=>'routes')),'Route dump',array('class'=>($action=='routes'?'active':''))) ?></li>
-				<li><?php echo html::anchor(Route::get('devtools')->uri(array('action'=>'config')),'Config dump',array('class'=>($action=='config'?'active':''))) ?></li>
-				<li><?php echo html::anchor(Route::get('devtools')->uri(array('action'=>'message')),'Message dump',array('class'=>($action=='message'?'active':''))) ?></li>
-				<li><?php echo html::anchor(Route::get('devtools')->uri(array('action'=>'i18n')),'i18n dump',array('class'=>($action=='i18n'?'active':''))) ?></li>
+				<li><?php echo HTML::anchor(Route::get('devtools')->uri(array('action'=>'info')),'Kohana info',array('class'=>($action=='info'?'active':''))) ?></li>
+				<li><?php echo HTML::anchor(Route::get('devtools')->uri(array('action'=>'extension')),'Transparent extension',array('class'=>($action=='extension'?'active':''))) ?></li>
+				<li><?php echo HTML::anchor(Route::get('devtools')->uri(array('action'=>'routetest')),'Route tester',array('class'=>($action=='routetest'?'active':''))) ?></li>
+				<li><?php echo HTML::anchor(Route::get('devtools')->uri(array('action'=>'routes')),'Route dump',array('class'=>($action=='routes'?'active':''))) ?></li>
+				<li><?php echo HTML::anchor(Route::get('devtools')->uri(array('action'=>'config')),'Config dump',array('class'=>($action=='config'?'active':''))) ?></li>
+				<li><?php echo HTML::anchor(Route::get('devtools')->uri(array('action'=>'message')),'Message dump',array('class'=>($action=='message'?'active':''))) ?></li>
+				<li><?php echo HTML::anchor(Route::get('devtools')->uri(array('action'=>'i18n')),'i18n dump',array('class'=>($action=='i18n'?'active':''))) ?></li>
 			</ul>
 		</div>