diff --git a/Plugin.php b/Plugin.php
index a1f2d93..60bf2d9 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -36,11 +36,11 @@ class Plugin extends PluginBase
     public function boot()
     {
         // Service provider
-        App::register('\Sensory5\Shortcode\Classes\ShortcodeServiceProvider');
+        App::register('\Sensory5\Shortcode\Classes\ServiceProvider');
 
         // Register alias
         $alias = AliasLoader::getInstance();
-        $alias->alias('Shortcode', '\Sensory5\Shortcode\Classes\ShortcodeFacade');
+        $alias->alias('Shortcode', '\Sensory5\Shortcode\Classes\Facade');
 
         // Enable shortcodes on all pages if requested
         if (Settings::get('enable_on_render', false))
diff --git a/classes/ShortcodeFacade.php b/classes/Facade.php
similarity index 73%
rename from classes/ShortcodeFacade.php
rename to classes/Facade.php
index 2c44795..453650e 100644
--- a/classes/ShortcodeFacade.php
+++ b/classes/Facade.php
@@ -1,8 +1,8 @@
 <?php namespace Sensory5\Shortcode\Classes;
 
-use Illuminate\Support\Facades\Facade;
+use October\Rain\Support\Facade as FacadeParent;
 
-class ShortcodeFacade extends Facade
+class Facade extends FacadeParent
 {
     /**
      * Get the registered name of the component.
diff --git a/classes/ServiceProvider.php b/classes/ServiceProvider.php
new file mode 100644
index 0000000..30ca686
--- /dev/null
+++ b/classes/ServiceProvider.php
@@ -0,0 +1,19 @@
+<?php namespace Sensory5\Shortcode\Classes;
+
+use October\Rain\Support\ServiceProvider as ServiceProviderParent;
+
+class ServiceProvider extends ServiceProviderParent
+{
+
+    /**
+     * Register the service provider.
+     */
+    public function register()
+    {
+        $this->app->bind('shortcode', function() {
+            return new Shortcode();
+        });
+    }
+
+}
+
diff --git a/classes/ShortcodeServiceProvider.php b/classes/ShortcodeServiceProvider.php
deleted file mode 100644
index dbeeac5..0000000
--- a/classes/ShortcodeServiceProvider.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php namespace Sensory5\Shortcode\Classes;
-
-use Illuminate\Support\ServiceProvider;
-
-class ShortcodeServiceProvider extends ServiceProvider
-{
-    /**
-     * Indicates if loading of the provider is deferred.
-     *
-     * @var bool
-     */
-    protected $defer = false;
-
-    /**
-     * Register the service provider.
-     */
-    public function register()
-    {
-        $this->app['shortcode'] = $this->app->share(function ($app) {
-            return new Shortcode();
-        });
-    }
-
-    /**
-     * Get the services provided by the provider.
-     *
-     * @return array
-     */
-    public function provides()
-    {
-        return array('shortcode');
-    }
-
-}
-