diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 6d58d78..5a0e677 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -9,6 +9,6 @@ Use issues to report errors / bugs only.
 
 Do you have questions?
 * Read the docs: https://skydiver.github.io/october-plugin-forms/docs/introduction/
-* Start a discussion: https://github.com/skydiver/october-plugin-forms/discussions
+* Start a discussion: https://github.com/blakej115/magic-forms/discussions
 
 -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 5e733e2..501d491 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Ask a question
-    url: https://github.com/skydiver/october-plugin-forms/discussions
+    url: https://github.com/blakej115/magic-forms/discussions
     about: Ask questions and discuss with other community members
\ No newline at end of file
diff --git a/Plugin.php b/Plugin.php
index 107cb00..373bc24 100644
--- a/Plugin.php
+++ b/Plugin.php
@@ -1,25 +1,25 @@
 <?php
 
-    namespace Martin\Forms;
+    namespace BlakeJones\MagicForms;
 
     use Backend, Lang, Validator;
     use System\Classes\PluginBase;
     use System\Classes\SettingsManager;
-    use Martin\Forms\Classes\BackendHelpers;
-    use Martin\Forms\Classes\GDPR;
-    use Martin\Forms\Classes\ReCaptchaValidator;
-    use Martin\Forms\Classes\UnreadRecords;
-    use Martin\Forms\Models\Settings;
+    use BlakeJones\MagicForms\Classes\BackendHelpers;
+    use BlakeJones\MagicForms\Classes\GDPR;
+    use BlakeJones\MagicForms\Classes\ReCaptchaValidator;
+    use BlakeJones\MagicForms\Classes\UnreadRecords;
+    use BlakeJones\MagicForms\Models\Settings;
 
     class Plugin extends PluginBase {
 
         public function pluginDetails() {
             return [
-                'name'        => 'martin.forms::lang.plugin.name',
-                'description' => 'martin.forms::lang.plugin.description',
-                'author'      => 'Martin M.',
+                'name'        => 'blakejones.magicforms::lang.plugin.name',
+                'description' => 'blakejones.magicforms::lang.plugin.description',
+                'author'      => 'Martin M. (Forked by Blake Jones)',
                 'icon'        => 'icon-bolt',
-                'homepage'    => 'https://github.com/skydiver/'
+                'homepage'    => 'https://github.com/blakej115/magic-forms'
             ];
         }
 
@@ -27,25 +27,25 @@ public function registerNavigation() {
             if(Settings::get('global_hide_button', false)) { return; }
             return [
                 'forms' => [
-                    'label'       => 'martin.forms::lang.menu.label',
+                    'label'       => 'blakejones.magicforms::lang.menu.label',
                     'icon'        => 'icon-bolt',
-                    'iconSvg'     => 'plugins/martin/forms/assets/imgs/icon.svg',
-                    'url'         => BackendHelpers::getBackendURL(['martin.forms.access_records' => 'martin/forms/records', 'martin.forms.access_exports' => 'martin/forms/exports'], 'martin.forms.access_records'),
-                    'permissions' => ['martin.forms.*'],
+                    'iconSvg'     => 'plugins/blakejones/magicforms/assets/imgs/icon.svg',
+                    'url'         => BackendHelpers::getBackendURL(['blakejones.magicforms.access_records' => 'blakejones/magicforms/records', 'blakejones.magicforms.access_exports' => 'blakejones/magicforms/exports'], 'blakejones.magicforms.access_records'),
+                    'permissions' => ['blakejones.magicforms.*'],
                     'sideMenu' => [
                         'records' => [
-                            'label'        => 'martin.forms::lang.menu.records.label',
+                            'label'        => 'blakejones.magicforms::lang.menu.records.label',
                             'icon'         => 'icon-database',
-                            'url'          => Backend::url('martin/forms/records'),
-                            'permissions'  => ['martin.forms.access_records'],
+                            'url'          => Backend::url('blakejones/magicforms/records'),
+                            'permissions'  => ['blakejones.magicforms.access_records'],
                             'counter'      => UnreadRecords::getTotal(),
                             'counterLabel' => 'Un-Read Messages'
                         ],
                         'exports' => [
-                            'label'       => 'martin.forms::lang.menu.exports.label',
+                            'label'       => 'blakejones.magicforms::lang.menu.exports.label',
                             'icon'        => 'icon-download',
-                            'url'         => Backend::url('martin/forms/exports'),
-                            'permissions' => ['martin.forms.access_exports']
+                            'url'         => Backend::url('blakejones/magicforms/exports'),
+                            'permissions' => ['blakejones.magicforms.access_exports']
                         ],
                     ]
                 ]
@@ -55,12 +55,12 @@ public function registerNavigation() {
         public function registerSettings() {
             return [
                 'config' => [
-                    'label'       => 'martin.forms::lang.menu.label',
-                    'description' => 'martin.forms::lang.menu.settings',
+                    'label'       => 'blakejones.magicforms::lang.menu.label',
+                    'description' => 'blakejones.magicforms::lang.menu.settings',
                     'category'    => SettingsManager::CATEGORY_CMS,
                     'icon'        => 'icon-bolt',
-                    'class'       => 'Martin\Forms\Models\Settings',
-                    'permissions' => ['martin.forms.access_settings'],
+                    'class'       => 'BlakeJones\MagicForms\Models\Settings',
+                    'permissions' => ['blakejones.magicforms.access_settings'],
                     'order'       => 500
                 ]
             ];
@@ -68,31 +68,31 @@ public function registerSettings() {
 
         public function registerPermissions() {
             return [
-                'martin.forms.access_settings' => ['tab' => 'martin.forms::lang.permissions.tab', 'label' => 'martin.forms::lang.permissions.access_settings'],
-                'martin.forms.access_records'  => ['tab' => 'martin.forms::lang.permissions.tab', 'label' => 'martin.forms::lang.permissions.access_records'],
-                'martin.forms.access_exports'  => ['tab' => 'martin.forms::lang.permissions.tab', 'label' => 'martin.forms::lang.permissions.access_exports'],
-                'martin.forms.gdpr_cleanup'    => ['tab' => 'martin.forms::lang.permissions.tab', 'label' => 'martin.forms::lang.permissions.gdpr_cleanup'],
+                'blakejones.magicforms.access_settings' => ['tab' => 'blakejones.magicforms::lang.permissions.tab', 'label' => 'blakejones.magicforms::lang.permissions.access_settings'],
+                'blakejones.magicforms.access_records'  => ['tab' => 'blakejones.magicforms::lang.permissions.tab', 'label' => 'blakejones.magicforms::lang.permissions.access_records'],
+                'blakejones.magicforms.access_exports'  => ['tab' => 'blakejones.magicforms::lang.permissions.tab', 'label' => 'blakejones.magicforms::lang.permissions.access_exports'],
+                'blakejones.magicforms.gdpr_cleanup'    => ['tab' => 'blakejones.magicforms::lang.permissions.tab', 'label' => 'blakejones.magicforms::lang.permissions.gdpr_cleanup'],
             ];
         }
 
         public function registerComponents() {
             return [
-                'Martin\Forms\Components\GenericForm' => 'genericForm',
-                'Martin\Forms\Components\UploadForm'  => 'uploadForm',
-                'Martin\Forms\Components\EmptyForm'   => 'emptyForm',
+                'BlakeJones\MagicForms\Components\GenericForm' => 'genericForm',
+                'BlakeJones\MagicForms\Components\UploadForm'  => 'uploadForm',
+                'BlakeJones\MagicForms\Components\EmptyForm'   => 'emptyForm',
             ];
         }
 
         public function registerMailTemplates() {
             return [
-                'martin.forms::mail.notification' => Lang::get('martin.forms::lang.mails.form_notification.description'),
-                'martin.forms::mail.autoresponse' => Lang::get('martin.forms::lang.mails.form_autoresponse.description'),
+                'blakejones.magicforms::mail.notification',
+                'blakejones.magicforms::mail.autoresponse',
             ];
         }
 
         public function register() {
             $this->app->resolving('validator', function($validator) {
-                Validator::extend('recaptcha', 'Martin\Forms\Classes\ReCaptchaValidator@validateReCaptcha');
+                Validator::extend('recaptcha', 'BlakeJones\MagicForms\Classes\ReCaptchaValidator@validateReCaptcha');
             });
         }
 
diff --git a/README.md b/README.md
index d870380..087a802 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
-# Magic Forms for OctoberCMS
+# Magic Forms for October CMS v3
 Create easy (and almost magic) AJAX forms.
 
-
+# Support for October CMS v3 (Forked)
+The original version of this plugin was [abandoned](https://github.com/skydiver/october-plugin-forms/discussions/267). This is an actively maintained fork of the [original plugin](https://octobercms.com/plugin/martin-forms) that supports October CMS v3.
 
 ## Why Magic Forms?
 Almost everyday we do forms for our clients, personal projects, etc
@@ -10,8 +11,6 @@ Sometimes we need to add or remove fields, change validations, store data and at
 
 So, the objective was to find a way to just put the HTML elements on the page, skip the repetitive task of coding and (with some kind of magic) store this data on a database or send by mail.
 
-
-
 ## Features
 * Create any type of form: contact, feedback, registration, uploads, etc
 * Write only HTML
@@ -29,8 +28,8 @@ So, the objective was to find a way to just put the HTML elements on the page, s
 * Inline errors with fields (read documentation for more info)
 * AJAX file uploads (BETA, available since v1.3.0)
 
+## Documentation
 
+New documentation coming soon. For now, you may reference the old documentation:
 
-## Documentation
-Checkout our docs at:
-> https://skydiver.github.io/october-plugin-forms/
+> https://skydiver.github.io/october-plugin-forms/docs/introduction/
\ No newline at end of file
diff --git a/classes/BackendHelpers.php b/classes/BackendHelpers.php
index f461dc0..4b9cb2c 100644
--- a/classes/BackendHelpers.php
+++ b/classes/BackendHelpers.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Martin\Forms\Classes;
+namespace BlakeJones\MagicForms\Classes;
 
 use Backend, BackendAuth;
 
@@ -30,7 +30,7 @@ public static function getBackendURL(array $urls, string $default) :string {
      * @return boolean
      */
     public static function isTranslatePlugin() :bool {
-        return class_exists('\RainLab\Translate\Classes\Translator') && class_exists('\RainLab\Translate\Models\Message');
+        return class_exists('\RainLab\Translate\Classes\Translator') && class_exists('\RainLab\Translate\Models\Message') && class_exists('\RainLab\Translate\Classes\Locale');
     }
 
     /**
@@ -84,4 +84,4 @@ public static function replaceToken(string $pattern, string $replacement = null,
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/classes/GDPR.php b/classes/GDPR.php
index 455dec2..2bb8d6e 100644
--- a/classes/GDPR.php
+++ b/classes/GDPR.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Martin\Forms\Classes;
+namespace BlakeJones\MagicForms\Classes;
 
 use Flash;
 use Request;
-use Martin\Forms\Models\Record;
-use Martin\Forms\Models\Settings;
+use BlakeJones\MagicForms\Models\Record;
+use BlakeJones\MagicForms\Models\Settings;
 use Carbon\Carbon;
 use October\Rain\Exception\ApplicationException;
 use October\Rain\Exception\ValidationException;
@@ -18,7 +18,7 @@ public static function cleanRecords() {
         $gdpr_days   = Settings::get('gdpr_days'  , false);
 
         if (!$gdpr_enable) {
-            Flash::error(e(trans('martin.forms::lang.classes.GDPR.alert_gdpr_disabled')));
+            Flash::error(e(trans('blakejones.magicforms::lang.classes.GDPR.alert_gdpr_disabled')));
             return;
         }
 
@@ -28,7 +28,7 @@ public static function cleanRecords() {
             return $rows;
         }
 
-        Flash::error(e(trans('martin.forms::lang.classes.GDPR.alert_invalid_gdpr')));
+        Flash::error(e(trans('blakejones.magicforms::lang.classes.GDPR.alert_invalid_gdpr')));
 
     }
 
diff --git a/classes/MagicForm.php b/classes/MagicForm.php
index 4fa1a99..4855b0b 100644
--- a/classes/MagicForm.php
+++ b/classes/MagicForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Martin\Forms\Classes;
+namespace BlakeJones\MagicForms\Classes;
 
 use Lang;
 use Config;
@@ -10,18 +10,18 @@
 use Validator;
 use AjaxException;
 use Cms\Classes\ComponentBase;
-use Martin\Forms\Models\Record;
-use Martin\Forms\Models\Settings;
-use Martin\Forms\Classes\SendMail;
+use BlakeJones\MagicForms\Models\Record;
+use BlakeJones\MagicForms\Models\Settings;
+use BlakeJones\MagicForms\Classes\SendMail;
 use Illuminate\Support\Facades\Event;
-use Martin\Forms\Classes\BackendHelpers;
+use BlakeJones\MagicForms\Classes\BackendHelpers;
 use October\Rain\Exception\ValidationException;
 
 abstract class MagicForm extends ComponentBase
 {
 
-    use \Martin\Forms\Classes\ReCaptcha;
-    use \Martin\Forms\Classes\SharedProperties;
+    use \BlakeJones\MagicForms\Classes\ReCaptcha;
+    use \BlakeJones\MagicForms\Classes\SharedProperties;
 
     public function onRun() {
 
@@ -33,7 +33,7 @@ public function onRun() {
         }
 
         if ($this->isReCaptchaMisconfigured()) {
-            $this->page['recaptcha_warn'] = Lang::get('martin.forms::lang.components.shared.recaptcha_warn');
+            $this->page['recaptcha_warn'] = Lang::get('blakejones.magicforms::lang.components.shared.recaptcha_warn');
         }
 
         if ($this->property('inline_errors') == 'display') {
@@ -59,18 +59,10 @@ public function onFormSubmit() {
             throw new AjaxException(['#' . $this->alias . '_forms_flash' => $this->renderPartial($flash_partial, [
                 'status'  => 'error',
                 'type'    => 'danger',
-                'content' => Lang::get('martin.forms::lang.components.shared.csrf_error'),
+                'content' => Lang::get('blakejones.magicforms::lang.components.shared.csrf_error'),
             ])]);
         }
 
-        // LOAD TRANSLATOR PLUGIN
-        if (BackendHelpers::isTranslatePlugin()) {
-            $translator = \RainLab\Translate\Classes\Translator::instance();
-            $translator->loadLocaleFromSession();
-            $locale = $translator->getLocale();
-            \RainLab\Translate\Models\Message::setContext($locale);
-        }
-
         // FILTER ALLOWED FIELDS
         $allow = $this->property('allowed_fields');
         if (is_array($allow) && !empty($allow)) {
@@ -150,7 +142,7 @@ public function onFormSubmit() {
 
             // PREPARE RECAPTCHA VALIDATION
             $rules   = ['g-recaptcha-response'           => 'recaptcha'];
-            $err_msg = ['g-recaptcha-response.recaptcha' => Lang::get('martin.forms::lang.validation.recaptcha_error')];
+            $err_msg = ['g-recaptcha-response.recaptcha' => Lang::get('blakejones.magicforms::lang.validation.recaptcha_error')];
 
             // DO SECOND VALIDATION
             $validator = Validator::make($post, $rules, $err_msg);
@@ -165,7 +157,7 @@ public function onFormSubmit() {
                     throw new AjaxException($this->_exceptionResponse($validator, [
                         'status'  => 'error',
                         'type'    => 'danger',
-                        'content' => Lang::get('martin.forms::lang.validation.recaptcha_error'),
+                        'content' => Lang::get('blakejones.magicforms::lang.validation.recaptcha_error'),
                         'errors'  => json_encode($validator->messages()->messages()),
                         'jscript' => $this->property('js_on_error'),
                     ]));
@@ -179,7 +171,7 @@ public function onFormSubmit() {
         unset($post['_token'], $post['g-recaptcha-response'], $post['_session_key'], $post['_uploader']);
 
         // FIRE BEFORE SAVE EVENT
-        Event::fire('martin.forms.beforeSaveRecord', [&$post, $this]);
+        Event::fire('blakejones.magicforms.beforeSaveRecord', [&$post, $this]);
 
         if (count($custom_attributes)) {
             $post = collect($post)->mapWithKeys(function ($val, $key) use ($custom_attributes) {
@@ -211,7 +203,7 @@ public function onFormSubmit() {
         }
 
         // FIRE AFTER SAVE EVENT
-        Event::fire('martin.forms.afterSaveRecord', [&$post, $this, $record]);
+        Event::fire('blakejones.magicforms.afterSaveRecord', [&$post, $this, $record]);
 
         // CHECK FOR REDIRECT
         if ($this->property('redirect')) {
diff --git a/classes/ReCaptcha.php b/classes/ReCaptcha.php
index 8aba6a8..5181f98 100644
--- a/classes/ReCaptcha.php
+++ b/classes/ReCaptcha.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Martin\Forms\Classes;
+namespace BlakeJones\MagicForms\Classes;
 
 use Session;
-use Martin\Forms\Classes\BackendHelpers;
-use Martin\Forms\Models\Settings;
+use BlakeJones\MagicForms\Classes\BackendHelpers;
+use BlakeJones\MagicForms\Models\Settings;
 use RainLab\Translate\Classes\Translator;
 
 trait ReCaptcha {
diff --git a/classes/ReCaptchaValidator.php b/classes/ReCaptchaValidator.php
index 36654ef..ce3d69e 100644
--- a/classes/ReCaptchaValidator.php
+++ b/classes/ReCaptchaValidator.php
@@ -1,9 +1,9 @@
 <?php
 
-    namespace Martin\Forms\Classes;
+    namespace BlakeJones\MagicForms\Classes;
 
     use Request;
-    use Martin\Forms\Models\Settings;
+    use BlakeJones\MagicForms\Models\Settings;
 
     class ReCaptchaValidator {
 
diff --git a/classes/SendMail.php b/classes/SendMail.php
index b7f2c50..d197fde 100644
--- a/classes/SendMail.php
+++ b/classes/SendMail.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Martin\Forms\Classes;
+namespace BlakeJones\MagicForms\Classes;
 
 use Mail;
 use System\Models\MailTemplate;
-use Martin\Forms\Classes\BackendHelpers;
+use BlakeJones\MagicForms\Classes\BackendHelpers;
 
 class SendMail {
 
@@ -23,7 +23,7 @@ public static function sendNotification($properties, $post, $record, $files) {
         if (is_array($properties['mail_recipients']) || is_array($properties['mail_bcc'])) {
 
             // CUSTOM TEMPLATE
-            $template = isset($properties['mail_template']) && $properties['mail_template'] != '' && MailTemplate::findOrMakeTemplate($properties['mail_template']) ? $properties['mail_template'] : 'martin.forms::mail.notification';
+            $template = isset($properties['mail_template']) && $properties['mail_template'] != '' && MailTemplate::findOrMakeTemplate($properties['mail_template']) ? $properties['mail_template'] : 'blakejones.magicforms::mail.notification';
 
             $data = [
                 'id'   => $record->id,
@@ -122,7 +122,7 @@ public static function sendAutoResponse($properties, $post, $record) {
         if (filter_var($to, FILTER_VALIDATE_EMAIL) && filter_var($from, FILTER_VALIDATE_EMAIL)) {
 
             // CUSTOM TEMPLATE
-            $template = isset($properties['mail_resp_template']) && $properties['mail_resp_template'] != '' && MailTemplate::findOrMakeTemplate($properties['mail_resp_template']) ? $properties['mail_resp_template'] : 'martin.forms::mail.autoresponse';
+            $template = isset($properties['mail_resp_template']) && $properties['mail_resp_template'] != '' && MailTemplate::findOrMakeTemplate($properties['mail_resp_template']) ? $properties['mail_resp_template'] : 'blakejones.magicforms::mail.autoresponse';
 
             Mail::sendTo($to, $template, [
                     'id'   => $record->id,
diff --git a/classes/SharedProperties.php b/classes/SharedProperties.php
index 31e1710..0c56430 100644
--- a/classes/SharedProperties.php
+++ b/classes/SharedProperties.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Martin\Forms\Classes;
+namespace BlakeJones\MagicForms\Classes;
 
 use Lang;
 
@@ -9,246 +9,246 @@ trait SharedProperties {
     public function defineProperties() {
         return [
             'group' => [
-                'title'             => 'martin.forms::lang.components.shared.group.title',
-                'description'       => 'martin.forms::lang.components.shared.group.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.group.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.group.description',
                 'type'              => 'string',
                 'showExternalParam' => false,
             ],
             'rules' => [
-                'title'             => 'martin.forms::lang.components.shared.rules.title',
-                'description'       => 'martin.forms::lang.components.shared.rules.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.rules.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.rules.description',
                 'type'              => 'dictionary',
-                'group'             => 'martin.forms::lang.components.shared.group_validation',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_validation',
                 'showExternalParam' => false,
             ],
             'rules_messages' => [
-                'title'             => 'martin.forms::lang.components.shared.rules_messages.title',
-                'description'       => 'martin.forms::lang.components.shared.rules_messages.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.rules_messages.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.rules_messages.description',
                 'type'              => 'dictionary',
-                'group'             => 'martin.forms::lang.components.shared.group_validation',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_validation',
                 'showExternalParam' => false,
             ],
             'custom_attributes' => [
-                'title'             => 'martin.forms::lang.components.shared.custom_attributes.title',
-                'description'       => 'martin.forms::lang.components.shared.custom_attributes.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.custom_attributes.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.custom_attributes.description',
                 'type'              => 'dictionary',
-                'group'             => 'martin.forms::lang.components.shared.group_validation',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_validation',
                 'showExternalParam' => false,
             ],
             'messages_success' => [
-                'title'             => 'martin.forms::lang.components.shared.messages_success.title',
-                'description'       => 'martin.forms::lang.components.shared.messages_success.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.messages_success.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.messages_success.description',
                 'type'              => 'string',
-                'group'             => 'martin.forms::lang.components.shared.group_messages',
-                'default'           => Lang::get('martin.forms::lang.components.shared.messages_success.default'),
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_messages',
+                'default'           => Lang::get('blakejones.magicforms::lang.components.shared.messages_success.default'),
                 'showExternalParam' => false,
-                'validation'        => ['required' => ['message' => Lang::get('martin.forms::lang.components.shared.validation_req')]]
+                'validation'        => ['required' => ['message' => Lang::get('blakejones.magicforms::lang.components.shared.validation_req')]]
             ],
             'messages_errors' => [
-                'title'             => 'martin.forms::lang.components.shared.messages_errors.title',
-                'description'       => 'martin.forms::lang.components.shared.messages_errors.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.messages_errors.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.messages_errors.description',
                 'type'              => 'string',
-                'group'             => 'martin.forms::lang.components.shared.group_messages',
-                'default'           => Lang::get('martin.forms::lang.components.shared.messages_errors.default'),
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_messages',
+                'default'           => Lang::get('blakejones.magicforms::lang.components.shared.messages_errors.default'),
                 'showExternalParam' => false,
-                'validation'        => ['required' => ['message' => Lang::get('martin.forms::lang.components.shared.validation_req')]]
+                'validation'        => ['required' => ['message' => Lang::get('blakejones.magicforms::lang.components.shared.validation_req')]]
             ],
             'messages_partial' => [
-                'title'             => 'martin.forms::lang.components.shared.messages_partial.title',
-                'description'       => 'martin.forms::lang.components.shared.messages_partial.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.messages_partial.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.messages_partial.description',
                 'type'              => 'string',
-                'group'             => 'martin.forms::lang.components.shared.group_messages',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_messages',
                 'showExternalParam' => false
             ],
             'mail_enabled' => [
-                'title'             => 'martin.forms::lang.components.shared.mail_enabled.title',
-                'description'       => 'martin.forms::lang.components.shared.mail_enabled.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.mail_enabled.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.mail_enabled.description',
                 'type'              => 'checkbox',
-                'group'             => 'martin.forms::lang.components.shared.group_mail',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_mail',
                 'showExternalParam' => false
             ],
             'mail_subject' => [
-                'title'             => 'martin.forms::lang.components.shared.mail_subject.title',
-                'description'       => 'martin.forms::lang.components.shared.mail_subject.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.mail_subject.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.mail_subject.description',
                 'type'              => 'string',
-                'group'             => 'martin.forms::lang.components.shared.group_mail',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_mail',
                 'showExternalParam' => false
             ],
             'mail_recipients' => [
-                'title'             => 'martin.forms::lang.components.shared.mail_recipients.title',
-                'description'       => 'martin.forms::lang.components.shared.mail_recipients.description',
-                'type'              => 'stringList',
-                'group'             => 'martin.forms::lang.components.shared.group_mail',
+                'title'             => 'blakejones.magicforms::lang.components.shared.mail_recipients.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.mail_recipients.description',
+                'type'              => 'dictionary',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_mail',
                 'showExternalParam' => false
             ],
             'mail_bcc' => [
-                'title'             => 'martin.forms::lang.components.shared.mail_bcc.title',
-                'description'       => 'martin.forms::lang.components.shared.mail_bcc.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.mail_bcc.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.mail_bcc.description',
                 'type'              => 'stringList',
-                'group'             => 'martin.forms::lang.components.shared.group_mail',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_mail',
                 'showExternalParam' => false
             ],
             'mail_replyto' => [
-                'title'             => 'martin.forms::lang.components.shared.mail_replyto.title',
-                'description'       => 'martin.forms::lang.components.shared.mail_replyto.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.mail_replyto.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.mail_replyto.description',
                 'type'              => 'string',
-                'group'             => 'martin.forms::lang.components.shared.group_mail',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_mail',
                 'showExternalParam' => false
             ],
             'mail_template' => [
-                'title'             => 'martin.forms::lang.components.shared.mail_template.title',
-                'description'       => 'martin.forms::lang.components.shared.mail_template.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.mail_template.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.mail_template.description',
                 'type'              => 'string',
-                'group'             => 'martin.forms::lang.components.shared.group_mail',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_mail',
                 'showExternalParam' => false
             ],
             'mail_resp_enabled' => [
-                'title'             => 'martin.forms::lang.components.shared.mail_resp_enabled.title',
-                'description'       => 'martin.forms::lang.components.shared.mail_resp_enabled.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.mail_resp_enabled.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.mail_resp_enabled.description',
                 'type'              => 'checkbox',
-                'group'             => 'martin.forms::lang.components.shared.group_mail_resp',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_mail_resp',
                 'showExternalParam' => false
             ],
             'mail_resp_field' => [
-                'title'             => 'martin.forms::lang.components.shared.mail_resp_field.title',
-                'description'       => 'martin.forms::lang.components.shared.mail_resp_field.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.mail_resp_field.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.mail_resp_field.description',
                 'type'              => 'string',
-                'group'             => 'martin.forms::lang.components.shared.group_mail_resp',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_mail_resp',
                 'showExternalParam' => false
             ],
             'mail_resp_from' => [
-                'title'             => 'martin.forms::lang.components.shared.mail_resp_from.title',
-                'description'       => 'martin.forms::lang.components.shared.mail_resp_from.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.mail_resp_from.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.mail_resp_from.description',
                 'type'              => 'string',
-                'group'             => 'martin.forms::lang.components.shared.group_mail_resp',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_mail_resp',
                 'showExternalParam' => false
             ],
             'mail_resp_subject' => [
-                'title'             => 'martin.forms::lang.components.shared.mail_resp_subject.title',
-                'description'       => 'martin.forms::lang.components.shared.mail_resp_subject.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.mail_resp_subject.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.mail_resp_subject.description',
                 'type'              => 'string',
-                'group'             => 'martin.forms::lang.components.shared.group_mail_resp',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_mail_resp',
                 'showExternalParam' => false
             ],
             'mail_resp_template' => [
-                'title'             => 'martin.forms::lang.components.shared.mail_template.title',
-                'description'       => 'martin.forms::lang.components.shared.mail_template.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.mail_template.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.mail_template.description',
                 'type'              => 'string',
-                'group'             => 'martin.forms::lang.components.shared.group_mail_resp',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_mail_resp',
                 'showExternalParam' => false
             ],
             'reset_form' => [
-                'title'             => 'martin.forms::lang.components.shared.reset_form.title',
-                'description'       => 'martin.forms::lang.components.shared.reset_form.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.reset_form.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.reset_form.description',
                 'type'              => 'checkbox',
-                'group'             => 'martin.forms::lang.components.shared.group_settings',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_settings',
                 'showExternalParam' => false
             ],
             'redirect' => [
-                'title'             => 'martin.forms::lang.components.shared.redirect.title',
-                'description'       => 'martin.forms::lang.components.shared.redirect.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.redirect.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.redirect.description',
                 'type'              => 'string',
-                'group'             => 'martin.forms::lang.components.shared.group_settings',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_settings',
                 'showExternalParam' => false
             ],
             'inline_errors' => [
-                'title'             => 'martin.forms::lang.components.shared.inline_errors.title',
-                'description'       => 'martin.forms::lang.components.shared.inline_errors.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.inline_errors.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.inline_errors.description',
                 'type'              => 'dropdown',
-                'options'           => ['disabled' => 'martin.forms::lang.components.shared.inline_errors.disabled', 'display' => 'martin.forms::lang.components.shared.inline_errors.display', 'variable' => 'martin.forms::lang.components.shared.inline_errors.variable'],
+                'options'           => ['disabled' => 'blakejones.magicforms::lang.components.shared.inline_errors.disabled', 'display' => 'blakejones.magicforms::lang.components.shared.inline_errors.display', 'variable' => 'blakejones.magicforms::lang.components.shared.inline_errors.variable'],
                 'default'           => 'disabled',
-                'group'             => 'martin.forms::lang.components.shared.group_settings',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_settings',
                 'showExternalParam' => false
             ],
             'js_on_success' => [
-                'title'             => 'martin.forms::lang.components.shared.js_on_success.title',
-                'description'       => 'martin.forms::lang.components.shared.js_on_success.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.js_on_success.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.js_on_success.description',
                 'type'              => 'text',
-                'group'             => 'martin.forms::lang.components.shared.group_settings',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_settings',
                 'showExternalParam' => false
             ],
             'js_on_error' => [
-                'title'             => 'martin.forms::lang.components.shared.js_on_error.title',
-                'description'       => 'martin.forms::lang.components.shared.js_on_error.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.js_on_error.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.js_on_error.description',
                 'type'              => 'text',
-                'group'             => 'martin.forms::lang.components.shared.group_settings',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_settings',
                 'showExternalParam' => false
             ],
             'allowed_fields' => [
-                'title'             => 'martin.forms::lang.components.shared.allowed_fields.title',
-                'description'       => 'martin.forms::lang.components.shared.allowed_fields.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.allowed_fields.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.allowed_fields.description',
                 'type'              => 'stringList',
-                'group'             => 'martin.forms::lang.components.shared.group_security',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_security',
                 'showExternalParam' => false
             ],
             'sanitize_data' => [
-                'title'             => 'martin.forms::lang.components.shared.sanitize_data.title',
-                'description'       => 'martin.forms::lang.components.shared.sanitize_data.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.sanitize_data.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.sanitize_data.description',
                 'type'              => 'dropdown',
-                'options'           => ['disabled' => 'martin.forms::lang.components.shared.sanitize_data.disabled', 'htmlspecialchars' => 'martin.forms::lang.components.shared.sanitize_data.htmlspecialchars'],
+                'options'           => ['disabled' => 'blakejones.magicforms::lang.components.shared.sanitize_data.disabled', 'htmlspecialchars' => 'blakejones.magicforms::lang.components.shared.sanitize_data.htmlspecialchars'],
                 'default'           => 'disabled',
-                'group'             => 'martin.forms::lang.components.shared.group_security',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_security',
                 'showExternalParam' => false
             ],
             'anonymize_ip' => [
-                'title'             => 'martin.forms::lang.components.shared.anonymize_ip.title',
-                'description'       => 'martin.forms::lang.components.shared.anonymize_ip.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.anonymize_ip.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.anonymize_ip.description',
                 'type'              => 'dropdown',
-                'options'           => ['disabled' => 'martin.forms::lang.components.shared.anonymize_ip.disabled', 'partial' => 'martin.forms::lang.components.shared.anonymize_ip.partial', 'full' => 'martin.forms::lang.components.shared.anonymize_ip.full'],
+                'options'           => ['disabled' => 'blakejones.magicforms::lang.components.shared.anonymize_ip.disabled', 'partial' => 'blakejones.magicforms::lang.components.shared.anonymize_ip.partial', 'full' => 'blakejones.magicforms::lang.components.shared.anonymize_ip.full'],
                 'default'           => 'disabled',
-                'group'             => 'martin.forms::lang.components.shared.group_security',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_security',
                 'showExternalParam' => false
             ],
             'recaptcha_enabled' => [
-                'title'             => 'martin.forms::lang.components.shared.recaptcha_enabled.title',
-                'description'       => 'martin.forms::lang.components.shared.recaptcha_enabled.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.recaptcha_enabled.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.recaptcha_enabled.description',
                 'type'              => 'checkbox',
-                'group'             => 'martin.forms::lang.components.shared.group_recaptcha',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_recaptcha',
                 'showExternalParam' => false
             ],
             'recaptcha_theme' => [
-                'title'             => 'martin.forms::lang.components.shared.recaptcha_theme.title',
-                'description'       => 'martin.forms::lang.components.shared.recaptcha_theme.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.recaptcha_theme.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.recaptcha_theme.description',
                 'type'              => 'dropdown',
-                'options'           => ['light' => 'martin.forms::lang.components.shared.recaptcha_theme.light', 'dark' => 'martin.forms::lang.components.shared.recaptcha_theme.dark'],
+                'options'           => ['light' => 'blakejones.magicforms::lang.components.shared.recaptcha_theme.light', 'dark' => 'blakejones.magicforms::lang.components.shared.recaptcha_theme.dark'],
                 'default'           => 'light',
-                'group'             => 'martin.forms::lang.components.shared.group_recaptcha',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_recaptcha',
                 'showExternalParam' => false
             ],
             'recaptcha_type' => [
-                'title'             => 'martin.forms::lang.components.shared.recaptcha_type.title',
-                'description'       => 'martin.forms::lang.components.shared.recaptcha_type.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.recaptcha_type.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.recaptcha_type.description',
                 'type'              => 'dropdown',
-                'options'           => ['image' => 'martin.forms::lang.components.shared.recaptcha_type.image', 'audio' => 'martin.forms::lang.components.shared.recaptcha_type.audio'],
+                'options'           => ['image' => 'blakejones.magicforms::lang.components.shared.recaptcha_type.image', 'audio' => 'blakejones.magicforms::lang.components.shared.recaptcha_type.audio'],
                 'default'           => 'image',
-                'group'             => 'martin.forms::lang.components.shared.group_recaptcha',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_recaptcha',
                 'showExternalParam' => false
             ],
             'recaptcha_size' => [
-                'title'             => 'martin.forms::lang.components.shared.recaptcha_size.title',
-                'description'       => 'martin.forms::lang.components.shared.recaptcha_size.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.recaptcha_size.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.recaptcha_size.description',
                 'type'              => 'dropdown',
                 'options'           => [
-                    'normal' => 'martin.forms::lang.components.shared.recaptcha_size.normal',
-                    'compact' => 'martin.forms::lang.components.shared.recaptcha_size.compact',
-                    'invisible' => 'martin.forms::lang.components.shared.recaptcha_size.invisible',
+                    'normal' => 'blakejones.magicforms::lang.components.shared.recaptcha_size.normal',
+                    'compact' => 'blakejones.magicforms::lang.components.shared.recaptcha_size.compact',
+                    'invisible' => 'blakejones.magicforms::lang.components.shared.recaptcha_size.invisible',
                 ],
                 'default'           => 'normal',
-                'group'             => 'martin.forms::lang.components.shared.group_recaptcha',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_recaptcha',
                 'showExternalParam' => false
             ],
             'skip_database' => [
-                'title'             => 'martin.forms::lang.components.shared.skip_database.title',
-                'description'       => 'martin.forms::lang.components.shared.skip_database.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.skip_database.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.skip_database.description',
                 'type'              => 'checkbox',
-                'group'             => 'martin.forms::lang.components.shared.group_advanced',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_advanced',
                 'showExternalParam' => false
             ],
             'emails_date_format' => [
-                'title'             => 'martin.forms::lang.components.shared.emails_date_format.title',
-                'description'       => 'martin.forms::lang.components.shared.emails_date_format.description',
+                'title'             => 'blakejones.magicforms::lang.components.shared.emails_date_format.title',
+                'description'       => 'blakejones.magicforms::lang.components.shared.emails_date_format.description',
                 'default'           => 'Y-m-d',
-                'group'             => 'martin.forms::lang.components.shared.group_advanced',
+                'group'             => 'blakejones.magicforms::lang.components.shared.group_advanced',
                 'showExternalParam' => false
             ],
         ];
diff --git a/classes/UnreadRecords.php b/classes/UnreadRecords.php
index c514a90..de3bd02 100644
--- a/classes/UnreadRecords.php
+++ b/classes/UnreadRecords.php
@@ -1,14 +1,18 @@
 <?php
 
-namespace Martin\Forms\Classes;
+namespace BlakeJones\MagicForms\Classes;
 
-use Martin\Forms\Models\Record;
+use Schema;
+use BlakeJones\MagicForms\Models\Record;
 
 class UnreadRecords {
 
     public static function getTotal() {
-        $unread = Record::where('unread', 1)->count();
-        return ($unread > 0) ? $unread : null;
+        if (Schema::hasTable('blakejones_magicforms_records')) {
+            $unread = Record::where('unread', 1)->count();
+        }
+
+        return (isset($unread) && $unread > 0) ? $unread : null;
     }
 
 }
diff --git a/components/EmptyForm.php b/components/EmptyForm.php
index ba94fea..a880cd3 100644
--- a/components/EmptyForm.php
+++ b/components/EmptyForm.php
@@ -1,15 +1,15 @@
 <?php
 
-    namespace Martin\Forms\Components;
+    namespace BlakeJones\MagicForms\Components;
 
-    use Martin\Forms\Classes\MagicForm;
+    use BlakeJones\MagicForms\Classes\MagicForm;
 
     class EmptyForm extends MagicForm {
 
         public function componentDetails() {
             return [
-                'name'        => 'martin.forms::lang.components.empty_form.name',
-                'description' => 'martin.forms::lang.components.empty_form.description',
+                'name'        => 'blakejones.magicforms::lang.components.empty_form.name',
+                'description' => 'blakejones.magicforms::lang.components.empty_form.description',
             ];
         }
 
diff --git a/components/GenericForm.php b/components/GenericForm.php
index 8a0ffe7..5219756 100644
--- a/components/GenericForm.php
+++ b/components/GenericForm.php
@@ -1,15 +1,15 @@
 <?php
 
-    namespace Martin\Forms\Components;
+    namespace BlakeJones\MagicForms\Components;
 
-    use Martin\Forms\Classes\MagicForm;
+    use BlakeJones\MagicForms\Classes\MagicForm;
 
     class GenericForm extends MagicForm {
 
         public function componentDetails() {
             return [
-                'name'        => 'martin.forms::lang.components.generic_form.name',
-                'description' => 'martin.forms::lang.components.generic_form.description',
+                'name'        => 'blakejones.magicforms::lang.components.generic_form.name',
+                'description' => 'blakejones.magicforms::lang.components.generic_form.description',
             ];
         }
 
diff --git a/components/UploadForm.php b/components/UploadForm.php
index c210d9d..c883650 100644
--- a/components/UploadForm.php
+++ b/components/UploadForm.php
@@ -1,20 +1,20 @@
 <?php
 
-    namespace Martin\Forms\Components;
+    namespace BlakeJones\MagicForms\Components;
 
     use Lang;
     use October\Rain\Filesystem\Definitions;
-    use Martin\Forms\Classes\MagicForm;
-    use Martin\Forms\Models\Record;
+    use BlakeJones\MagicForms\Classes\MagicForm;
+    use BlakeJones\MagicForms\Models\Record;
 
     class UploadForm extends MagicForm {
 
-        use \Martin\Forms\Traits\FileUploader;
+        use \BlakeJones\MagicForms\Traits\FileUploader;
 
         public function componentDetails() {
             return [
-                'name'        => 'martin.forms::lang.components.upload_form.name',
-                'description' => 'martin.forms::lang.components.upload_form.description',
+                'name'        => 'blakejones.magicforms::lang.components.upload_form.name',
+                'description' => 'blakejones.magicforms::lang.components.upload_form.description',
             ];
         }
 
@@ -40,59 +40,59 @@ public function onRun() {
         public function defineProperties() {
             $local = [
                 'mail_uploads' => [
-                    'title'             => 'martin.forms::lang.components.shared.mail_uploads.title',
-                    'description'       => 'martin.forms::lang.components.shared.mail_uploads.description',
+                    'title'             => 'blakejones.magicforms::lang.components.shared.mail_uploads.title',
+                    'description'       => 'blakejones.magicforms::lang.components.shared.mail_uploads.description',
                     'type'              => 'checkbox',
                     'default'           => false,
-                    'group'             => 'martin.forms::lang.components.shared.group_mail',
+                    'group'             => 'blakejones.magicforms::lang.components.shared.group_mail',
                     'showExternalParam' => false
                 ],
                 'uploader_enable' => [
-                    'title'             => 'martin.forms::lang.components.shared.uploader_enable.title',
-                    'description'       => 'martin.forms::lang.components.shared.uploader_enable.description',
+                    'title'             => 'blakejones.magicforms::lang.components.shared.uploader_enable.title',
+                    'description'       => 'blakejones.magicforms::lang.components.shared.uploader_enable.description',
                     'default'           => false,
                     'type'              => 'checkbox',
-                    'group'             => 'martin.forms::lang.components.shared.group_uploader',
+                    'group'             => 'blakejones.magicforms::lang.components.shared.group_uploader',
                     'showExternalParam' => false,
                 ],
                 'uploader_multi' => [
-                    'title'             => 'martin.forms::lang.components.shared.uploader_multi.title',
-                    'description'       => 'martin.forms::lang.components.shared.uploader_multi.description',
+                    'title'             => 'blakejones.magicforms::lang.components.shared.uploader_multi.title',
+                    'description'       => 'blakejones.magicforms::lang.components.shared.uploader_multi.description',
                     'default'           => true,
                     'type'              => 'checkbox',
-                    'group'             => 'martin.forms::lang.components.shared.group_uploader',
+                    'group'             => 'blakejones.magicforms::lang.components.shared.group_uploader',
                     'showExternalParam' => false,
                 ],
                 'placeholderText' => [
-                    'title'             => 'martin.forms::lang.components.shared.uploader_pholder.title',
-                    'description'       => 'martin.forms::lang.components.shared.uploader_pholder.description',
-                    'default'           => Lang::get('martin.forms::lang.components.shared.uploader_pholder.default'),
+                    'title'             => 'blakejones.magicforms::lang.components.shared.uploader_pholder.title',
+                    'description'       => 'blakejones.magicforms::lang.components.shared.uploader_pholder.description',
+                    'default'           => Lang::get('blakejones.magicforms::lang.components.shared.uploader_pholder.default'),
                     'type'              => 'string',
-                    'group'             => 'martin.forms::lang.components.shared.group_uploader',
+                    'group'             => 'blakejones.magicforms::lang.components.shared.group_uploader',
                     'showExternalParam' => false,
                 ],
                 'removeText' => [
-                    'title'             => 'martin.forms::lang.components.shared.uploader_remFile.title',
-                    'description'       => 'martin.forms::lang.components.shared.uploader_remFile.description',
-                    'default'           => Lang::get('martin.forms::lang.components.shared.uploader_remFile.default'),
+                    'title'             => 'blakejones.magicforms::lang.components.shared.uploader_remFile.title',
+                    'description'       => 'blakejones.magicforms::lang.components.shared.uploader_remFile.description',
+                    'default'           => Lang::get('blakejones.magicforms::lang.components.shared.uploader_remFile.default'),
                     'type'              => 'string',
-                    'group'             => 'martin.forms::lang.components.shared.group_uploader',
+                    'group'             => 'blakejones.magicforms::lang.components.shared.group_uploader',
                     'showExternalParam' => false,
                 ],
                 'maxSize' => [
-                    'title'             => 'martin.forms::lang.components.shared.uploader_maxsize.title',
-                    'description'       => 'martin.forms::lang.components.shared.uploader_maxsize.description',
+                    'title'             => 'blakejones.magicforms::lang.components.shared.uploader_maxsize.title',
+                    'description'       => 'blakejones.magicforms::lang.components.shared.uploader_maxsize.description',
                     'default'           => '5',
                     'type'              => 'string',
-                    'group'             => 'martin.forms::lang.components.shared.group_uploader',
+                    'group'             => 'blakejones.magicforms::lang.components.shared.group_uploader',
                     'showExternalParam' => false,
                 ],
                 'fileTypes' => [
-                    'title'             => 'martin.forms::lang.components.shared.uploader_types.title',
-                    'description'       => 'martin.forms::lang.components.shared.uploader_types.description',
+                    'title'             => 'blakejones.magicforms::lang.components.shared.uploader_types.title',
+                    'description'       => 'blakejones.magicforms::lang.components.shared.uploader_types.description',
                     'default'           => Definitions::get('defaultExtensions'),
                     'type'              => 'stringList',
-                    'group'             => 'martin.forms::lang.components.shared.group_uploader',
+                    'group'             => 'blakejones.magicforms::lang.components.shared.group_uploader',
                     'showExternalParam' => false,
                 ],
             ];
diff --git a/components/partials/flash.htm b/components/partials/flash.htm
index 1b89b06..fa06a3f 100644
--- a/components/partials/flash.htm
+++ b/components/partials/flash.htm
@@ -1,7 +1,5 @@
-{% spaceless %}
-
-    <div class="alert alert-{{ type }} alert-dismissible" role="alert">
-        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+<div class="alert alert-{{ type }} alert-dismissible" role="alert">
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
 
     {% if title %}
         <h4>{{ title }}</h4>
@@ -18,16 +16,13 @@ <h4>{{ title }}</h4>
         {% endfor %}
         </ul>
     {% endif %}
+</div>
 
-    </div>
-
-    {% if jscript %}
-        <script>
-            {% if errors %}
-                var errors = JSON.parse('{{ errors|raw }}');
-            {% endif %}
-            {{ jscript|raw }}
-        </script>
-    {% endif %}
-
-{% endspaceless %}
+{% if jscript %}
+    <script>
+        {% if errors %}
+            var errors = JSON.parse('{{ errors|raw }}');
+        {% endif %}
+        {{ jscript|raw }}
+    </script>
+{% endif %}
\ No newline at end of file
diff --git a/components/uploadform/file-multi.htm b/components/uploadform/file-multi.htm
index c17f5ae..db8f1a0 100644
--- a/components/uploadform/file-multi.htm
+++ b/components/uploadform/file-multi.htm
@@ -22,7 +22,7 @@
                     {% if file.isImage %}
                         <img src="{{ file.thumbUrl }}" alt="" />
                     {% else %}
-                        <img src="{{ 'plugins/martin/forms/assets/imgs/upload.png'|app }}" alt="" />
+                        <img src="{{ 'plugins/blakejones/magicforms/assets/imgs/upload.png'|app }}" alt="" />
                     {% endif %}
                 </div>
                 <div class="info">
@@ -49,7 +49,7 @@ <h4 class="filename">
 <script type="text/template" id="uploaderTemplate{{ __SELF__ }}">
     <div class="upload-object dz-preview dz-file-preview">
         <div class="icon-container">
-            <img data-dz-thumbnail src="{{ 'plugins/martin/forms/assets/imgs/upload.png'|app }}" />
+            <img data-dz-thumbnail src="{{ 'plugins/blakejones/magicforms/assets/imgs/upload.png'|app }}" />
         </div>
         <div class="info">
             <h4 class="filename">
diff --git a/components/uploadform/file-single.htm b/components/uploadform/file-single.htm
index ee1fe7f..3c7eadc 100644
--- a/components/uploadform/file-single.htm
+++ b/components/uploadform/file-single.htm
@@ -24,7 +24,7 @@
                     {% if file.isImage %}
                         <img src="{{ file.thumbUrl }}" alt="" />
                     {% else %}
-                        <img src="{{ 'plugins/martin/forms/assets/imgs/upload.png'|app }}" alt="" />
+                        <img src="{{ 'plugins/blakejones/magicforms/assets/imgs/upload.png'|app }}" alt="" />
                     {% endif %}
                 </div>
                 <div class="info">
diff --git a/composer.json b/composer.json
index ec907fa..44a713d 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
-    "name": "martin/forms-plugin",
+    "name": "blakejones/magicforms-plugin",
     "type": "october-plugin",
     "description": "Create easy (and almost magic) AJAX forms",
     "keywords": ["october", "cms", "plugin", "forms", "magic forms"],
-    "homepage": "https://octobercms.com/plugin/martin-forms",
+    "homepage": "https://github.com/blakej115/magic-forms",
     "license": "MIT"
 }
diff --git a/controllers/Exports.php b/controllers/Exports.php
index f7ed90b..711b0fa 100644
--- a/controllers/Exports.php
+++ b/controllers/Exports.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Martin\Forms\Controllers;
+namespace BlakeJones\MagicForms\Controllers;
 
 use BackendMenu, Response;
 use Backend\Classes\Controller;
 use League\Csv\AbstractCsv;
 use League\Csv\Writer as CsvWriter;
 use SplTempFileObject;
-use Martin\Forms\Models\Record;
+use BlakeJones\MagicForms\Models\Record;
 
 class Exports extends Controller {
 
-    public $requiredPermissions = ['martin.forms.access_exports'];
+    public $requiredPermissions = ['blakejones.magicforms.access_exports'];
 
     public $implement = [
         'Backend.Behaviors.FormController',
@@ -21,11 +21,11 @@ class Exports extends Controller {
 
     public function __construct() {
         parent::__construct();
-        BackendMenu::setContext('Martin.Forms', 'forms', 'exports');
+        BackendMenu::setContext('BlakeJones.MagicForms', 'forms', 'exports');
     }
 
     public function index() {
-        $this->pageTitle = e(trans('martin.forms::lang.controllers.exports.title'));
+        $this->pageTitle = e(trans('blakejones.magicforms::lang.controllers.exports.title'));
         $this->create('frontend');
     }
 
@@ -72,10 +72,10 @@ public function csv() {
         // METADATA HEADERS
         if (post('Record.options_metadata')) {
             $meta_headers = [
-                e(trans('martin.forms::lang.controllers.records.columns.id')),
-                e(trans('martin.forms::lang.controllers.records.columns.group')),
-                e(trans('martin.forms::lang.controllers.records.columns.ip')),
-                e(trans('martin.forms::lang.controllers.records.columns.created_at')),
+                e(trans('blakejones.magicforms::lang.controllers.records.columns.id')),
+                e(trans('blakejones.magicforms::lang.controllers.records.columns.group')),
+                e(trans('blakejones.magicforms::lang.controllers.records.columns.ip')),
+                e(trans('blakejones.magicforms::lang.controllers.records.columns.created_at')),
             ];
             $headers = array_merge($meta_headers, $headers);
         }
@@ -84,7 +84,9 @@ public function csv() {
         $filteredRecords = $records->get();
         $recordsArray = $filteredRecords->toArray();
         $record = $filteredRecords->first();
-        $headers = array_merge($headers, array_keys($record->form_data_arr));
+        if (isset($record)) {
+            $headers = array_merge($headers, array_keys($record->form_data_arr));
+        }
 
         // ADD HEADERS
         $csv->insertOne($headers);
diff --git a/controllers/Records.php b/controllers/Records.php
index c683a47..0766bf0 100644
--- a/controllers/Records.php
+++ b/controllers/Records.php
@@ -1,15 +1,15 @@
 <?php
 
-    namespace Martin\Forms\Controllers;
+    namespace BlakeJones\MagicForms\Controllers;
 
     use App, BackendMenu, Lang;
     use Backend\Classes\Controller;
     use Backend\Facades\Backend;
     use Illuminate\Support\Facades\Redirect;
     use October\Rain\Support\Facades\Flash;
-    use Martin\Forms\Classes\GDPR;
-    use Martin\Forms\Classes\UnreadRecords;
-    use Martin\Forms\Models\Record;
+    use BlakeJones\MagicForms\Classes\GDPR;
+    use BlakeJones\MagicForms\Classes\UnreadRecords;
+    use BlakeJones\MagicForms\Models\Record;
 
     class Records extends Controller {
 
@@ -19,23 +19,23 @@ class Records extends Controller {
 
         public $listConfig = 'config_list.yaml';
 
-        public $requiredPermissions = ['martin.forms.access_records'];
+        public $requiredPermissions = ['blakejones.magicforms.access_records'];
 
         public function __construct() {
             parent::__construct();
-            BackendMenu::setContext('Martin.Forms', 'forms', 'records');
+            BackendMenu::setContext('BlakeJones.MagicForms', 'forms', 'records');
         }
 
         public function view($id) {
             $record = Record::find($id);
             if(!$record) {
-                Flash::error(e(trans('martin.forms::lang.controllers.records.error')));
-                return Redirect::to(Backend::url('martin/forms/records'));
+                Flash::error(e(trans('blakejones.magicforms::lang.controllers.records.error')));
+                return Redirect::to(Backend::url('blakejones/magicforms/records'));
             }
             $record->unread = false;
             $record->save();
-            $this->addCss('/plugins/martin/forms/assets/css/records.css');
-            $this->pageTitle      = e(trans('martin.forms::lang.controllers.records.view_title'));
+            $this->addCss('/plugins/blakejones/magicforms/assets/css/records.css');
+            $this->pageTitle      = e(trans('blakejones.magicforms::lang.controllers.records.view_title'));
             $this->vars['record'] = $record;
         }
 
@@ -55,11 +55,11 @@ public function onDeleteSingle() {
             $record = Record::find($id);
             if($record) {
                 $record->delete();
-                Flash::success(e(trans('martin.forms::lang.controllers.records.deleted')));
+                Flash::success(e(trans('blakejones.magicforms::lang.controllers.records.deleted')));
             } else {
-                Flash::error(e(trans('martin.forms::lang.controllers.records.error')));
+                Flash::error(e(trans('blakejones.magicforms::lang.controllers.records.error')));
             }
-            return Redirect::to(Backend::url('martin/forms/records'));
+            return Redirect::to(Backend::url('blakejones/magicforms/records'));
         }
 
         public function download($record_id, $file_id) {
@@ -89,11 +89,11 @@ public function onReadState() {
         }
 
         public function onGDPRClean() {
-            if ($this->user->hasPermission(['martin.forms.gdpr_cleanup'])) {
+            if ($this->user->hasPermission(['blakejones.magicforms.gdpr_cleanup'])) {
                 GDPR::cleanRecords();
-                Flash::success(e(trans('martin.forms::lang.controllers.records.alerts.gdpr_success')));
+                Flash::success(e(trans('blakejones.magicforms::lang.controllers.records.alerts.gdpr_success')));
             } else {
-                Flash::error(e(trans('martin.forms::lang.controllers.records.alerts.gdpr_perms')));
+                Flash::error(e(trans('blakejones.magicforms::lang.controllers.records.alerts.gdpr_perms')));
             }
             $counter = UnreadRecords::getTotal();
             return [
diff --git a/controllers/exports/config_form.yaml b/controllers/exports/config_form.yaml
index eb53dde..0ffb86c 100644
--- a/controllers/exports/config_form.yaml
+++ b/controllers/exports/config_form.yaml
@@ -1,2 +1,2 @@
-form      : $/martin/forms/models/export/fields.yaml
-modelClass: Martin\Forms\Models\Record
\ No newline at end of file
+form      : $/blakejones/magicforms/models/export/fields.yaml
+modelClass: BlakeJones\MagicForms\Models\Record
\ No newline at end of file
diff --git a/controllers/exports/index.htm b/controllers/exports/index.htm
index e12c469..a50a2ba 100644
--- a/controllers/exports/index.htm
+++ b/controllers/exports/index.htm
@@ -1,16 +1,16 @@
 <?php Block::put('breadcrumb') ?>
     <ul>
-        <li><a href="<?php echo Backend::url('martin/forms/records') ?>"><?php echo e(trans('martin.forms::lang.menu.records.label')) ?></a></li>
-        <li><?php echo e(trans('martin.forms::lang.controllers.exports.breadcrumb')) ?></li>
+        <li><a href="<?php echo Backend::url('blakejones/magicforms/records') ?>"><?php echo e(trans('blakejones.magicforms::lang.menu.records.label')) ?></a></li>
+        <li><?php echo e(trans('blakejones.magicforms::lang.controllers.exports.breadcrumb')) ?></li>
     </ul>
 <?php Block::endPut() ?>
 
-<?php echo Form::open(['url' => Backend::url('martin/forms/exports/csv/')]) ?>
+<?php echo Form::open(['url' => Backend::url('blakejones/magicforms/exports/csv/')]) ?>
 
     <?php echo $this->formRender() ?>
 
     <div class="form-buttons m-t-lg">
-        <?= Form::submit(e(trans('martin.forms::lang.controllers.exports.title')), ['class' => 'btn btn-primary']) ?>
+        <?= Form::submit(e(trans('blakejones.magicforms::lang.controllers.exports.title')), ['class' => 'btn btn-primary']) ?>
     </div>
 
 <?php echo Form::close() ?>
\ No newline at end of file
diff --git a/controllers/records/config_filter.yaml b/controllers/records/config_filter.yaml
index 4130510..a1b0fb8 100644
--- a/controllers/records/config_filter.yaml
+++ b/controllers/records/config_filter.yaml
@@ -1,13 +1,13 @@
 scopes:
 
     group:
-        label     : martin.forms::lang.controllers.records.columns.group
+        label     : blakejones.magicforms::lang.controllers.records.columns.group
         type      : group
-        modelClass: Martin\Forms\Models\Record
+        modelClass: BlakeJones\MagicForms\Models\Record
         options   : filterGroups
         conditions: "`group` in (:filtered)"
 
     created_at:
-        label     : martin.forms::lang.controllers.records.columns.created_at
+        label     : blakejones.magicforms::lang.controllers.records.columns.created_at
         type      : daterange
         conditions: created_at >= ':after' AND created_at <= ':before'
\ No newline at end of file
diff --git a/controllers/records/config_list.yaml b/controllers/records/config_list.yaml
index 6efedf4..072bfa4 100644
--- a/controllers/records/config_list.yaml
+++ b/controllers/records/config_list.yaml
@@ -1,7 +1,7 @@
-list            : $/martin/forms/models/record/columns.yaml
-modelClass      : Martin\Forms\Models\Record
-title           : martin.forms::lang.controllers.records.title
-recordUrl       : martin/forms/records/view/:id
+list            : $/blakejones/magicforms/models/record/columns.yaml
+modelClass      : BlakeJones\MagicForms\Models\Record
+title           : blakejones.magicforms::lang.controllers.records.title
+recordUrl       : blakejones/magicforms/records/view/:id
 noRecordsMessage: backend::lang.list.no_records
 recordsPerPage  : 20
 showSetup       : true
diff --git a/controllers/records/partials/_list_toolbar.htm b/controllers/records/partials/_list_toolbar.htm
index 86fc91b..d8c8305 100644
--- a/controllers/records/partials/_list_toolbar.htm
+++ b/controllers/records/partials/_list_toolbar.htm
@@ -1,7 +1,7 @@
 <div id="records-toolbar" data-control="toolbar">
 
     <?php
-        echo $this->makePartial('$/martin/forms/controllers/records/partials/_action_button.htm', [
+        echo $this->makePartial('$/blakejones/magicforms/controllers/records/partials/_action_button.htm', [
             'type'            => 'danger',
             'icon'            => 'oc-icon-trash',
             'label'           => e(trans('backend::lang.list.delete_selected')),
@@ -17,6 +17,7 @@
                     'interval': 3
                 });
                 $.oc.sideNav.setCounter('forms/records', data.counter);
+                $.oc.sideNav.setCounter('forms', data.counter);
                 $('#Lists').html(data.list['#Lists']);
             ",
         ]);
@@ -24,10 +25,10 @@
 
     <div class="btn-group">
     <?php
-        echo $this->makePartial('$/martin/forms/controllers/records/partials/_action_button.htm', [
+        echo $this->makePartial('$/blakejones/magicforms/controllers/records/partials/_action_button.htm', [
             'type'            => 'default',
             'icon'            => 'oc-icon-eye-slash',
-            'label'           => e(trans('martin.forms::lang.controllers.records.buttons.unread')),
+            'label'           => e(trans('blakejones.magicforms::lang.controllers.records.buttons.unread')),
             'onclick'         => "$(this).data('request-data', { state: 'unread', checked: $('.control-list').listWidget('getChecked') })",
             'needs_selected'  => true,
             'request'         => 'onReadState',
@@ -35,14 +36,15 @@
             'request_success' => "
                 $('#records-toolbar').find('button').prop('disabled', true);
                 $.oc.sideNav.setCounter('forms/records', data.counter);
+                $.oc.sideNav.setCounter('forms', data.counter);
                 $('#Lists').html(data.list['#Lists']);
             ",
         ]);
 
-        echo $this->makePartial('$/martin/forms/controllers/records/partials/_action_button.htm', [
+        echo $this->makePartial('$/blakejones/magicforms/controllers/records/partials/_action_button.htm', [
             'type'            => 'default',
             'icon'            => 'oc-icon-eye',
-            'label'           => e(trans('martin.forms::lang.controllers.records.buttons.read')),
+            'label'           => e(trans('blakejones.magicforms::lang.controllers.records.buttons.read')),
             'onclick'         => "$(this).data('request-data', { state: 'read', checked: $('.control-list').listWidget('getChecked') })",
             'needs_selected'  => true,
             'request'         => 'onReadState',
@@ -50,6 +52,7 @@
             'request_success' => "
                 $('#records-toolbar').find('button').prop('disabled', true);
                 $.oc.sideNav.setCounter('forms/records', data.counter);
+                $.oc.sideNav.setCounter('forms', data.counter);
                 $('#Lists').html(data.list['#Lists']);
             ",
         ]);
@@ -57,16 +60,17 @@
     </div>
 
     <?php
-        if(Martin\Forms\Models\Settings::get('gdpr_enable')) {
-            echo $this->makePartial('$/martin/forms/controllers/records/partials/_action_button.htm', [
+        if(BlakeJones\MagicForms\Models\Settings::get('gdpr_enable')) {
+            echo $this->makePartial('$/blakejones/magicforms/controllers/records/partials/_action_button.htm', [
                 'type'            => 'danger',
                 'icon'            => 'oc-icon-history',
-                'label'           => e(trans('martin.forms::lang.controllers.records.buttons.gdpr_clean')),
+                'label'           => e(trans('blakejones.magicforms::lang.controllers.records.buttons.gdpr_clean')),
                 'request'         => 'onGDPRClean',
-                'request_confirm' => e(trans('martin.forms::lang.controllers.records.alerts.gdpr_confirm')),
+                'request_confirm' => e(trans('blakejones.magicforms::lang.controllers.records.alerts.gdpr_confirm')),
                 'request_success' => "
                     $('#records-toolbar').find('button').blur();
                     $.oc.sideNav.setCounter('forms/records', data.counter);
+                    $.oc.sideNav.setCounter('forms', data.counter);
                     $('#Lists').html(data.list['#Lists']);
                 ",
             ]);
diff --git a/controllers/records/partials/_view_toolbar.htm b/controllers/records/partials/_view_toolbar.htm
index d8bf808..9c5faad 100644
--- a/controllers/records/partials/_view_toolbar.htm
+++ b/controllers/records/partials/_view_toolbar.htm
@@ -1,7 +1,7 @@
 <div class="control-toolbar">
     <div class="toolbar-item toolbar-primary">
         <div data-control="toolbar">
-            <a href="<?= Backend::url('martin/forms/records') ?>" type="button" class="btn btn-default oc-icon-arrow-left"><?= e(trans('backend::lang.form.return_to_list')) ?></a>
+            <a href="<?= Backend::url('blakejones/magicforms/records') ?>" type="button" class="btn btn-default oc-icon-arrow-left"><?= e(trans('backend::lang.form.return_to_list')) ?></a>
             <button type="button" class="btn btn-danger oc-icon-trash"
                     data-request="onDeleteSingle"
                     data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')) ?>"
diff --git a/controllers/records/view.htm b/controllers/records/view.htm
index e8a8f2e..f33f777 100644
--- a/controllers/records/view.htm
+++ b/controllers/records/view.htm
@@ -1,6 +1,6 @@
 <?php Block::put('breadcrumb') ?>
     <ul>
-        <li><a href="<?php echo Backend::url('martin/forms/records') ?>"><?php echo e(trans('martin.forms::lang.menu.records.label')) ?></a></li>
+        <li><a href="<?php echo Backend::url('blakejones/magicforms/records') ?>"><?php echo e(trans('blakejones.magicforms::lang.menu.records.label')) ?></a></li>
         <li>Record #<?php echo $record->id ?></li>
     </ul>
 <?php Block::endPut() ?>
@@ -16,7 +16,7 @@ <h2 class="text-center">Record #<?php echo $record->id ?></h2>
         <td class="record-value">
         <?php if(is_array($value) || is_object($value)): ?>
             <ul>
-                <?php echo \Martin\Forms\Classes\BackendHelpers::array2ul($value) ?>
+                <?php echo \BlakeJones\MagicForms\Classes\BackendHelpers::array2ul($value) ?>
             </ul>
         <?php else: ?>
             <?php echo nl2br(htmlspecialchars($value, ENT_QUOTES)); ?>
@@ -31,7 +31,7 @@ <h2 class="text-center">Record #<?php echo $record->id ?></h2>
             <ul>
             <?php foreach($record->files as $file): ?>
                 <li>
-                    <a href="<?php echo Backend::url('martin/forms/records/download', [$record->id, $file->id]) ?>">
+                    <a href="<?php echo Backend::url('blakejones/magicforms/records/download', [$record->id, $file->id]) ?>">
                         <?php echo $file->file_name ?>
                         (<?php echo $file->sizeToString() ?>)
                     </a>
@@ -44,7 +44,7 @@ <h2 class="text-center">Record #<?php echo $record->id ?></h2>
 </table>
 
 <div class="record-metadata m-t-md m-r-md text-right">
-    <p class="m-a-0"><?php echo e(trans('martin.forms::lang.controllers.records.columns.group')) ?>: <?php echo $record->group ?></p>
-    <p class="m-a-0"><?php echo e(trans('martin.forms::lang.controllers.records.columns.ip')) ?>: <?php echo $record->ip ?></p>
-    <p class="m-a-0"><?php echo e(trans('martin.forms::lang.controllers.records.columns.created_at')) ?>: <?php echo $record->created_at ?></p>
+    <p class="m-a-0"><?php echo e(trans('blakejones.magicforms::lang.controllers.records.columns.group')) ?>: <?php echo $record->group ?></p>
+    <p class="m-a-0"><?php echo e(trans('blakejones.magicforms::lang.controllers.records.columns.ip')) ?>: <?php echo $record->ip ?></p>
+    <p class="m-a-0"><?php echo e(trans('blakejones.magicforms::lang.controllers.records.columns.created_at')) ?>: <?php echo $record->created_at ?></p>
 </div>
\ No newline at end of file
diff --git a/lang/de/lang.php b/lang/de/lang.php
index 244ae1d..777cd2c 100644
--- a/lang/de/lang.php
+++ b/lang/de/lang.php
@@ -93,10 +93,10 @@
                 'messages_partial'  => ['title' => 'Benutze eigene Partial' , 'description' => 'Überschreibe Flash-Nachrichten mit deinem eigenem Partial in deinem Theme'],
                 'mail_enabled'      => ['title' => 'Sende Benachrichtigungen' , 'description' => 'Sende eine Benachrichtigungsmail nach jeder erfolgreichen Übertragung.'],
                 'mail_subject'      => ['title' => 'Betreff'            , 'description' => 'Überschreibe die standard E-Mail Betreffszeile'],
-                'mail_recipients'   => ['title' => 'Empfänger'         , 'description' => 'E-Mail Empfänger eintragen (Füge eine E-Mail Adresse pro Zeile ein)'],
+                'mail_recipients'   => ['title' => 'Empfänger'         , 'description' => 'E-Mail-Empfänger angeben. Verwenden Sie E-Mail-Adressen als Schlüssel und Namen als Werte.'],
                 'mail_bcc'          => ['title' => 'BCC'                , 'description' => 'Sende blind carbon copy (BCC) zur folgenden Empfängern (Füge eine E-Mail Adresse per Zeile ein)'],
                 'mail_replyto'      => ['title' => 'Empfänger E-Mail Feld', 'description' => 'Formular Feld das die E-Mail Adresse enthält. Diese Adresse wird als Empfänger Adresse benutzt.'],
-                'mail_template'     => ['title' => 'E-Mail Vorlage'      , 'description' => 'Benutze eigene E-Mail Vorlagen. Gebe einen Vorlagen Code ein wie z.B. "martin.forms::mail.notification" (Kann im Einstellungen der E-Mail Vorlagen im Backend gefunden werden). Leer lassen für Standardvorlage.'],
+                'mail_template'     => ['title' => 'E-Mail Vorlage'      , 'description' => 'Benutze eigene E-Mail Vorlagen. Gebe einen Vorlagen Code ein wie z.B. "blakejones.magicforms::mail.notification" (Kann im Einstellungen der E-Mail Vorlagen im Backend gefunden werden). Leer lassen für Standardvorlage.'],
                 'mail_uploads'      => ['title' => 'Sende Uploads'       , 'description' => 'Sende Uploads als Anhang'],
                 'mail_resp_enabled' => ['title' => 'Sende Auto-Antwort' , 'description' => 'Sende eine automatische Antwort E-Mail zu der Person die dein Formular ausgfüllt.'],
                 'mail_resp_field'   => ['title' => 'E-Mail Feld'        , 'description' => 'Formular Feld das die E-Mail Adresse enthät für die automatische Antwort'],
diff --git a/lang/en/lang.php b/lang/en/lang.php
index 2e1c9f1..e5148b3 100644
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -93,10 +93,10 @@
                 'messages_partial'  => ['title' => 'Use Custom Partial' , 'description' => 'Override flash messages with your custom partial inside your theme'],
                 'mail_enabled'      => ['title' => 'Send Notifications' , 'description' => 'Send mail notifications on every form submitted'],
                 'mail_subject'      => ['title' => 'Subject'            , 'description' => 'Override default email subject'],
-                'mail_recipients'   => ['title' => 'Recipients'         , 'description' => 'Specify email recipients (add one address per line)'],
+                'mail_recipients'   => ['title' => 'Recipients'         , 'description' => 'Specify email recipients. Use email addresses as keys and names as the values.'],
                 'mail_bcc'          => ['title' => 'BCC'                , 'description' => 'Send blind carbon copy to email recipients (add one address per line)'],
                 'mail_replyto'      => ['title' => 'ReplyTo Email Field', 'description' => 'Form field containing the email address of sender to be used as "ReplyTo"'],
-                'mail_template'     => ['title' => 'Mail Template'      , 'description' => 'Use custom mail template. Specify template code like "martin.forms::mail.notification" (found on Settings, Mail templates). Leave empty to use default.'],
+                'mail_template'     => ['title' => 'Mail Template'      , 'description' => 'Use custom mail template. Specify template code like "blakejones.magicforms::mail.notification" (found on Settings, Mail templates). Leave empty to use default.'],
                 'mail_uploads'      => ['title' => 'Send Uploads'       , 'description' => 'Send uploads as attachments'],
                 'mail_resp_enabled' => ['title' => 'Send Auto-Response' , 'description' => 'Send an auto-response email to the person submitting the form'],
                 'mail_resp_field'   => ['title' => 'Email Field'        , 'description' => 'Form field containing the email address of the recipient of auto-response'],
diff --git a/lang/fr/lang.php b/lang/fr/lang.php
index 997a4df..65ef26a 100644
--- a/lang/fr/lang.php
+++ b/lang/fr/lang.php
@@ -82,11 +82,11 @@
                 'messages_partial'  => ['title' => 'Utiliser un modèle partiel personnalisé', 'description' => 'Modifier le message flash avec un modèle partiel personnalisé de votre thème'],
                 'mail_enabled'      => ['title' => 'Envoyer des notifications'              , 'description' => 'Envoyer des notifications par mail sur chaque formulaire envoyé'],
                 'mail_subject'      => ['title' => 'Sujet'                                  , 'description' => 'Remplacer le sujet par défaut du courrier électronique'],
-                'mail_recipients'   => ['title' => 'Destinataires'                          , 'description' => 'Spécifier les destinataires des e-mails (ajouter une adresse par ligne)'],
+                'mail_recipients'   => ['title' => 'Destinataires'                          , 'description' => 'Spécifiez les destinataires des e-mails. Utilisez les adresses e-mail comme clés et les noms comme valeurs.'],
                 'mail_bcc'          => ['title' => 'CCI'                                    , 'description' => 'Envoyer une copie carbone invisible aux destinataires des e-mails (ajouter une adresse par ligne)'],
                 'mail_replyto'      => ['title' => 'Champ du email de réponse (ReplyTo)'    , 'description' => 'Champ de formulaire contenant l\'adresse e-mail de l\'expéditeur à utiliser comme "ReplyTo"'],
                 'mail_uploads'      => ['title' => 'Envoyer les téléchargements'            , 'description' => 'Envoi des fichiers téléchargés en pièce jointe'],
-                'mail_template'     => ['title' => 'Modèle e-mail'                          , 'description' => 'Utiliser un modèle e-mail personnalisé. Spécifiez un code de modèle tel que "martin.forms::mail.notification" (situé dans Paramètres, Modèles des e-mails). Laissez vide pour utiliser les paramètres par défaut.'],
+                'mail_template'     => ['title' => 'Modèle e-mail'                          , 'description' => 'Utiliser un modèle e-mail personnalisé. Spécifiez un code de modèle tel que "blakejones.magicforms::mail.notification" (situé dans Paramètres, Modèles des e-mails). Laissez vide pour utiliser les paramètres par défaut.'],
                 'mail_uploads'      => ['title' => 'Envoyer les téléchargements'            , 'description' => 'Envoyer les téléchargements en pièces jointes'],
                 'mail_resp_enabled' => ['title' => 'Envoyer une réponse automatique'        , 'description' => 'Envoyer un e-mail d\'auto-réponse à la personne qui soumet le formulaire'],
                 'mail_resp_field'   => ['title' => 'Champ email'                            , 'description' => 'Champ de formulaire contenant l\'adresse e-mail du destinataire de réponse automatique '],
diff --git a/lang/nl/lang.php b/lang/nl/lang.php
index 8acd55c..ff500c2 100644
--- a/lang/nl/lang.php
+++ b/lang/nl/lang.php
@@ -93,10 +93,10 @@
                 'messages_partial'  => ['title' => 'Gebruik Aangepaste Partial'   , 'description' => 'Overschrijf flashberichten met uw eigen partials in uw thema'],
                 'mail_enabled'      => ['title' => 'Stuur Notificaties'           , 'description' => 'Stuur e-mailmeldingen over elk ingediend formulier'],
                 'mail_subject'      => ['title' => 'Onderwerp'                    , 'description' => 'Standaard e-mail onderwerp overschrijven'],
-                'mail_recipients'   => ['title' => 'Ontvangers'                   , 'description' => 'Geef de e-mailadressen op (één adres per regel)'],
+                'mail_recipients'   => ['title' => 'Ontvangers'                   , 'description' => 'Geef e-mailontvangers op. Gebruik e-mailadressen als sleutels en namen als waarden.'],
                 'mail_bcc'          => ['title' => 'BCC'                          , 'description' => 'Stuur een BBC naar de ontvangers (één adres per regel)'],
                 'mail_replyto'      => ['title' => 'ReplyTo E-mail Veld'          , 'description' => 'Formulierveld met het e-mailadres van de afzender dat moet worden gebruikt als "ReplyTo"'],
-                'mail_template'     => ['title' => 'E-mail sjabloon'              , 'description' => 'Gebruik een aangepast e-mail sjabloon. Specificeer sjabloon code zoals "martin.forms::mail.notification" (te vinden onder Instellingen, E-mail sjablonen). Laat leeg om de standaard te gebruiken.'],
+                'mail_template'     => ['title' => 'E-mail sjabloon'              , 'description' => 'Gebruik een aangepast e-mail sjabloon. Specificeer sjabloon code zoals "blakejones.magicforms::mail.notification" (te vinden onder Instellingen, E-mail sjablonen). Laat leeg om de standaard te gebruiken.'],
                 'mail_uploads'      => ['title' => 'Verstuur uploads'             , 'description' => 'Verstuur uploads als bijlagen'],
                 'mail_resp_enabled' => ['title' => 'Stuur automatisch antwoord'   , 'description' => 'Stuur een automatische e-mail naar de persoon die het formulier heeft ingediend'],
                 'mail_resp_field'   => ['title' => 'E-mail Veld'                  , 'description' => 'Formulierveld met het e-mailadres van de ontvanger van het automatische antwoord'],
diff --git a/lang/pt-br/lang.php b/lang/pt-br/lang.php
index 7329b96..66c4042 100644
--- a/lang/pt-br/lang.php
+++ b/lang/pt-br/lang.php
@@ -72,7 +72,7 @@
                 'messages_errors'   => ['title' => 'Erros'                        , 'description' => 'Mensagem quando o formulário contém erros', 'default' => 'Ocorreu um erro no envio'],
                 'mail_enabled'      => ['title' => 'Enviar Notificações'          , 'description' => 'Enviar notificações por email em todos os formulários enviados'],
                 'mail_subject'      => ['title' => 'Assunto'                      , 'description' => 'Substitui o assunto de email padrão'],
-                'mail_recipients'   => ['title' => 'Destinatários'                , 'description' => 'Especifique destinatários de email (adicione um endereço por linha)'],
+                'mail_recipients'   => ['title' => 'Destinatários'                , 'description' => 'Especifique os destinatários de e-mail. Use endereços de e-mail como chaves e nomes como valores.'],
                 'mail_uploads'      => ['title' => 'Enviar Uploads'               , 'description' => 'Enviar uploads como anexos'],
                 'mail_resp_enabled' => ['title' => 'Enviar Resposta Automática'   , 'description' => 'Enviar um email de resposta automática para a pessoa que envia o formulário'],
                 'mail_resp_field'   => ['title' => 'Campo de Email'               , 'description' => 'Campo de formulário que contém o endereço de email do destinatário da resposta automática'],
diff --git a/lang/ru/lang.php b/lang/ru/lang.php
index c2dad15..4939077 100644
--- a/lang/ru/lang.php
+++ b/lang/ru/lang.php
@@ -93,10 +93,10 @@
                 'messages_partial'  => ['title' => 'Кастомный фрагмент' , 'description' => 'Переопределить стандартные уведомления кастомным фрагментом из вашей фронтенд темы.'],
                 'mail_enabled'      => ['title' => 'Отправка уведомлений','description' => 'Отправлять увдеомления по email после каждого успешного заполенния формы.'],
                 'mail_subject'      => ['title' => 'Тема письма'        , 'description' => 'Переопределить тему письма по умолчанию'],
-                'mail_recipients'   => ['title' => 'Получатели'         , 'description' => 'Укажите получателей электронной почты (По одному адресу в строке)'],
+                'mail_recipients'   => ['title' => 'Получатели'         , 'description' => 'Укажите получателей электронной почты. Используйте адреса электронной почты в качестве ключей и имена в качестве значений.'],
                 'mail_bcc'          => ['title' => 'BCC'                , 'description' => 'Отправить копию получателям электронной почты (По одному адресу в строке)'],
                 'mail_replyto'      => ['title' => 'ReplyTo поле email' , 'description' => 'Поле формы, содержащее адрес электронной почты отправителя, который будет использоваться как "ReplyTo"'],
-                'mail_template'     => ['title' => 'Шаблон письма'      , 'description' => 'Используйте собственный шаблон письма. Укажите код шаблона, например, "martin.forms::mail.notification" (находится в разделе Настройки -> Почтовые шаблоны). Оставьте пустым, чтобы использовать по умолчанию.'],
+                'mail_template'     => ['title' => 'Шаблон письма'      , 'description' => 'Используйте собственный шаблон письма. Укажите код шаблона, например, "blakejones.magicforms::mail.notification" (находится в разделе Настройки -> Почтовые шаблоны). Оставьте пустым, чтобы использовать по умолчанию.'],
                 'mail_uploads'      => ['title' => 'Прикреплять файлы'  , 'description' => 'Прикреплять файлы к письму'],
                 'mail_resp_enabled' => ['title' => 'Отправить авто-ответ','description' => 'Отправить автоответчик на email отправителя.'],
                 'mail_resp_field'   => ['title' => 'Email поле'         , 'description' => 'Имя поля с email отправителя'],
diff --git a/lang/tr/lang.php b/lang/tr/lang.php
index 86c229f..b500441 100644
--- a/lang/tr/lang.php
+++ b/lang/tr/lang.php
@@ -68,7 +68,7 @@
                 'messages_errors'   => ['title' => 'Hatalar'             , 'description' => 'Formda hatalar olduğunda gösterilecek mesaj'         , 'default' => 'Gönderiminizle ilgili hatalar vardı.'],
                 'allowed_fields'    => ['title' => 'İzin Verilen Alanlar', 'description' => 'Filtrelenecek ve depolanacak alanları belirtin (her satır için bir alan adı ekleyin)'],
                 'mail_enabled'      => ['title' => 'Posta Bildirimleri'  , 'description' => 'Gönderilen her formda posta gönder'],
-                'mail_recipients'   => ['title' => 'Posta Alıcıları'     , 'description' => 'E-posta alıcılarını belirtin (her hat için bir adres ekleyin)'],
+                'mail_recipients'   => ['title' => 'Posta Alıcıları'     , 'description' => 'E-posta alıcılarını belirtin. Anahtar olarak e-posta adreslerini ve değerler olarak adları kullanın.'],
                 'recaptcha_enabled' => ['title' => 'ReCAPTCHAyı etkinleştir'  , 'description' => 'ReCAPTCHA widgetını formunuza ekleyin.'],
                 'recaptcha_theme'   => ['title' => 'Tema'                , 'description' => 'Widgetin renk teması', 'light'  => 'Aydınlık' , 'dark'    => 'Karanlık'],
                 'recaptcha_type'    => ['title' => 'Tip'                 , 'description' => 'Gösterilecek CAPTCHA türü' , 'image'  => 'Resim' , 'audio'   => 'Ses'],
diff --git a/lang/zh-cn/lang.php b/lang/zh-cn/lang.php
index a53e084..967fdc5 100644
--- a/lang/zh-cn/lang.php
+++ b/lang/zh-cn/lang.php
@@ -89,10 +89,10 @@
                 'messages_partial'  => ['title' => '使用自定义 Partial' , 'description' => 'Override flash messages with your custom partial inside your theme'],
                 'mail_enabled'      => ['title' => '发送通知' , 'description' => 'Send mail notifications on every form submited'],
                 'mail_subject'      => ['title' => '主题'            , 'description' => 'Override default email subject'],
-                'mail_recipients'   => ['title' => '收件人'         , 'description' => 'Specify email recipients (add one address per line)'],
+                'mail_recipients'   => ['title' => '收件人'         , 'description' => 'Specify email recipients. Use email addresses as keys and names as the values.'],
                 'mail_bcc'          => ['title' => '密送'                , 'description' => 'Send blind carbon copy to email recipients (add one address per line)'],
                 'mail_replyto'      => ['title' => '回复邮件字段', 'description' => 'Form field containing the email address of sender to be used as "ReplyTo"'],
-                'mail_template'     => ['title' => '邮件模板'      , 'description' => 'Use custom mail template. Specify template code like "martin.forms::mail.notification" (found on Settings, Mail templates). Leave empty to use default.'],
+                'mail_template'     => ['title' => '邮件模板'      , 'description' => 'Use custom mail template. Specify template code like "blakejones.magicforms::mail.notification" (found on Settings, Mail templates). Leave empty to use default.'],
                 'mail_uploads'      => ['title' => '发送上传文件'       , 'description' => 'Send uploads as attachements'],
                 'mail_resp_enabled' => ['title' => '发送自动回复' , 'description' => 'Send an auto-response email to the person submitting the form'],
                 'mail_resp_field'   => ['title' => '邮件字段'        , 'description' => 'Form field containing the email address of the recipient of auto-response'],
diff --git a/models/Record.php b/models/Record.php
index 973e753..3ac9375 100644
--- a/models/Record.php
+++ b/models/Record.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Martin\Forms\Models;
+    namespace BlakeJones\MagicForms\Models;
 
     use Model;
 
@@ -8,7 +8,7 @@ class Record extends Model {
 
         use \October\Rain\Database\Traits\SoftDelete;
 
-        public $table = 'martin_forms_records';
+        public $table = 'blakejones_magicforms_records';
 
         protected $dates = ['deleted_at'];
 
diff --git a/models/Settings.php b/models/Settings.php
index d5d3463..dcef27d 100644
--- a/models/Settings.php
+++ b/models/Settings.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Martin\Forms\Models;
+    namespace BlakeJones\MagicForms\Models;
 
     use Lang, Model;
     use Cms\Classes\Theme;
@@ -11,13 +11,13 @@ class Settings extends Model {
         use \October\Rain\Database\Traits\Validation;
 
         public $implement      = ['System.Behaviors.SettingsModel'];
-        public $settingsCode   = 'martin_forms_settings';
+        public $settingsCode   = 'blakejones_magicforms_settings';
         public $settingsFields = 'fields.yaml';
 
         // public function __construct() {
         //     $this->attributes = [
-        //         'global_messages_success' => Lang::get('martin.forms::lang.settings.global_messages_success.default'),
-        //         'global_messages_errors'  => Lang::get('martin.forms::lang.settings.global_messages_errors.default'),
+        //         'global_messages_success' => Lang::get('blakejones.magicforms::lang.settings.global_messages_success.default'),
+        //         'global_messages_errors'  => Lang::get('blakejones.magicforms::lang.settings.global_messages_errors.default'),
         //     ];
         //     parent::__construct();
         // }
diff --git a/models/export/fields.yaml b/models/export/fields.yaml
index 59ff392..347730e 100644
--- a/models/export/fields.yaml
+++ b/models/export/fields.yaml
@@ -2,24 +2,24 @@ fields:
 
     header:
         type: partial
-        path: $/martin/forms/models/export/_header.htm
+        path: $/blakejones/magicforms/models/export/_header.htm
         span: left
 
     ################################################################################################################################################
     #   FILTER SECTION
     ################################################################################################################################################
     filter_section:
-        label   : martin.forms::lang.controllers.exports.filter_section
+        label   : blakejones.magicforms::lang.controllers.exports.filter_section
         type    : section
         cssClass: m-t-md
 
     filter_type:
-        label  : martin.forms::lang.controllers.exports.filter_type
+        label  : blakejones.magicforms::lang.controllers.exports.filter_type
         type   : switch
         default: true
 
     filter_groups:
-        label  : martin.forms::lang.controllers.exports.filter_groups
+        label  : blakejones.magicforms::lang.controllers.exports.filter_groups
         span   : left
         type   : checkboxlist
         options: getGroupsOptions
@@ -29,7 +29,7 @@ fields:
             condition: checked
 
     filter_date_after:
-        label  : martin.forms::lang.controllers.exports.filter_date_after
+        label  : blakejones.magicforms::lang.controllers.exports.filter_date_after
         span   : left
         type   : datepicker
         mode   : date
@@ -39,7 +39,7 @@ fields:
             condition: checked
 
     filter_date_before:
-        label  : martin.forms::lang.controllers.exports.filter_date_before
+        label  : blakejones.magicforms::lang.controllers.exports.filter_date_before
         span   : left
         type   : datepicker
         mode   : date
@@ -52,33 +52,33 @@ fields:
     #   OPTIONS SECTION
     ################################################################################################################################################
     options_section:
-        label   : martin.forms::lang.controllers.exports.options_section
+        label   : blakejones.magicforms::lang.controllers.exports.options_section
         type    : section
         cssClass: m-t-md
 
     options_delimiter:
-        label  : martin.forms::lang.controllers.exports.options_delimiter
-        comment: martin.forms::lang.controllers.exports.options_delimiter_com
+        label  : blakejones.magicforms::lang.controllers.exports.options_delimiter
+        comment: blakejones.magicforms::lang.controllers.exports.options_delimiter_com
         span   : right
         type   : switch
         default: false
 
     options_metadata:
-        label  : martin.forms::lang.controllers.exports.options_metadata
-        comment: martin.forms::lang.controllers.exports.options_metadata_com
+        label  : blakejones.magicforms::lang.controllers.exports.options_metadata
+        comment: blakejones.magicforms::lang.controllers.exports.options_metadata_com
         span   : left
         type   : switch
         default: true
 
     options_utf:
-        label  : martin.forms::lang.controllers.exports.options_utf
-        comment: martin.forms::lang.controllers.exports.options_utf_com
+        label  : blakejones.magicforms::lang.controllers.exports.options_utf
+        comment: blakejones.magicforms::lang.controllers.exports.options_utf_com
         span   : right
         type   : switch
         default: true
 
     options_deleted:
-        label  : martin.forms::lang.controllers.exports.options_deleted
+        label  : blakejones.magicforms::lang.controllers.exports.options_deleted
         span   : left
         type   : switch
         default: false
diff --git a/models/record/columns.yaml b/models/record/columns.yaml
index f1389fe..6a426b3 100644
--- a/models/record/columns.yaml
+++ b/models/record/columns.yaml
@@ -1,31 +1,31 @@
 columns:
 
     id:
-        label     : martin.forms::lang.controllers.records.columns.id
+        label     : blakejones.magicforms::lang.controllers.records.columns.id
         searchable: true
 
     group:
-        label     : martin.forms::lang.controllers.records.columns.group
+        label     : blakejones.magicforms::lang.controllers.records.columns.group
         searchable: true
 
     ip:
-        label     : martin.forms::lang.controllers.records.columns.ip
+        label     : blakejones.magicforms::lang.controllers.records.columns.ip
         searchable: true
 
     form_data:
-        label     : martin.forms::lang.controllers.records.columns.form_data
+        label     : blakejones.magicforms::lang.controllers.records.columns.form_data
         type      : partial
-        path      : $/martin/forms/models/record/fields/_stored_fields.htm
+        path      : $/blakejones/magicforms/models/record/fields/_stored_fields.htm
         searchable: true
 
     files:
-        label     : martin.forms::lang.controllers.records.columns.files
+        label     : blakejones.magicforms::lang.controllers.records.columns.files
         type      : partial
-        path      : $/martin/forms/models/record/fields/_files_fields.htm
+        path      : $/blakejones/magicforms/models/record/fields/_files_fields.htm
         searchable: false
         sortable  : false
        #invisible : true
 
     created_at:
-        label: martin.forms::lang.controllers.records.columns.created_at
+        label: blakejones.magicforms::lang.controllers.records.columns.created_at
         type: datetime
diff --git a/models/settings/_gdpr_help.htm b/models/settings/_gdpr_help.htm
index 63d32e6..6456438 100644
--- a/models/settings/_gdpr_help.htm
+++ b/models/settings/_gdpr_help.htm
@@ -1,10 +1,10 @@
 <div class="callout callout-info no-subheader">
     <div class="header">
         <i class="icon-info"></i>
-        <h3><?php echo e(trans('martin.forms::lang.settings.gdpr_help_title')) ?></h3>
+        <h3><?php echo e(trans('blakejones.magicforms::lang.settings.gdpr_help_title')) ?></h3>
     </div>
     <div class="content">
-        <p><?php echo e(trans('martin.forms::lang.settings.gdpr_help_comment')) ?></p>
+        <p><?php echo e(trans('blakejones.magicforms::lang.settings.gdpr_help_comment')) ?></p>
         <p>More info at <a href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation" target="_blank">Wikipedia</a></p>
     </div>
 </div>
\ No newline at end of file
diff --git a/models/settings/_plugin_help.htm b/models/settings/_plugin_help.htm
index 7b37bfb..af04093 100644
--- a/models/settings/_plugin_help.htm
+++ b/models/settings/_plugin_help.htm
@@ -1,9 +1,9 @@
 <div class="callout callout-info no-subheader">
     <div class="header">
         <i class="icon-info"></i>
-        <h3><?php echo e(trans('martin.forms::lang.plugin.name')) ?></h3>
+        <h3><?php echo e(trans('blakejones.magicforms::lang.plugin.name')) ?></h3>
     </div>
     <div class="content">
-        <p><?php echo e(trans('martin.forms::lang.settings.plugin_help')) ?> <a href="https://github.com/skydiver/october-plugin-forms" target="_blank">https://github.com/skydiver/october-plugin-forms</a></p>
+        <p><?php echo e(trans('blakejones.magicforms::lang.settings.plugin_help')) ?> <a href="https://github.com/blakej115/magic-forms" target="_blank">https://github.com/blakej115/magic-forms</a></p>
     </div>
 </div>
\ No newline at end of file
diff --git a/models/settings/fields.yaml b/models/settings/fields.yaml
index 99aedad..560e2b4 100644
--- a/models/settings/fields.yaml
+++ b/models/settings/fields.yaml
@@ -3,47 +3,47 @@ tabs:
 
         plugin_help:
             type   : partial
-            path   : $/martin/forms/models/settings/_plugin_help.htm
-            tab    : martin.forms::lang.settings.tabs.general
+            path   : $/blakejones/magicforms/models/settings/_plugin_help.htm
+            tab    : blakejones.magicforms::lang.settings.tabs.general
 
         global_hide_button:
-            label  : martin.forms::lang.settings.global_hide_button
-            comment: martin.forms::lang.settings.global_hide_button_desc
+            label  : blakejones.magicforms::lang.settings.global_hide_button
+            comment: blakejones.magicforms::lang.settings.global_hide_button_desc
             type   : switch
             default: false
-            tab    : martin.forms::lang.settings.tabs.general
+            tab    : blakejones.magicforms::lang.settings.tabs.general
 
         recaptcha_help:
             type   : partial
-            path   : $/martin/forms/models/settings/_recaptcha_help.htm
-            tab    : martin.forms::lang.settings.tabs.recaptcha
+            path   : $/blakejones/magicforms/models/settings/_recaptcha_help.htm
+            tab    : blakejones.magicforms::lang.settings.tabs.recaptcha
 
         recaptcha_site_key:
-            label: martin.forms::lang.settings.recaptcha_site_key
+            label: blakejones.magicforms::lang.settings.recaptcha_site_key
             span : left
-            tab  : martin.forms::lang.settings.tabs.recaptcha
+            tab  : blakejones.magicforms::lang.settings.tabs.recaptcha
 
         recaptcha_secret_key:
-            label: martin.forms::lang.settings.recaptcha_secret_key
+            label: blakejones.magicforms::lang.settings.recaptcha_secret_key
             span : right
-            tab  : martin.forms::lang.settings.tabs.recaptcha
+            tab  : blakejones.magicforms::lang.settings.tabs.recaptcha
 
         gdpr_help:
             type   : partial
-            path   : $/martin/forms/models/settings/_gdpr_help.htm
-            tab    : martin.forms::lang.settings.tabs.gdpr
+            path   : $/blakejones/magicforms/models/settings/_gdpr_help.htm
+            tab    : blakejones.magicforms::lang.settings.tabs.gdpr
 
         gdpr_enable:
-            label  : martin.forms::lang.settings.gdpr_enable
+            label  : blakejones.magicforms::lang.settings.gdpr_enable
             type   : switch
             default: false
-            tab    : martin.forms::lang.settings.tabs.gdpr
+            tab    : blakejones.magicforms::lang.settings.tabs.gdpr
 
         gdpr_days:
-            label  : martin.forms::lang.settings.gdpr_days
+            label  : blakejones.magicforms::lang.settings.gdpr_days
             span   : left
             default: 120
-            tab    : martin.forms::lang.settings.tabs.gdpr
+            tab    : blakejones.magicforms::lang.settings.tabs.gdpr
             trigger:
                 action: show
                 field: gdpr_enable
diff --git a/tests/unit/classes/BackendHelpersTest.php b/tests/unit/classes/BackendHelpersTest.php
index 258956f..00f11fa 100644
--- a/tests/unit/classes/BackendHelpersTest.php
+++ b/tests/unit/classes/BackendHelpersTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Martin\Forms\Tests\Classes;
+namespace BlakeJones\MagicForms\Tests\Classes;
 
 use Backend;
 use BackendAuth;
@@ -9,7 +9,7 @@
 use Illuminate\Support\Facades\Auth;
 use System\Classes\PluginManager;
 use Backend\Models\User;
-use Martin\Forms\Classes\BackendHelpers;
+use BlakeJones\MagicForms\Classes\BackendHelpers;
 
 class BackendHelpersTest extends PluginTestCase {
 
@@ -25,12 +25,12 @@ public function setUp() {
      */
     public function testGetBackendUrl() {
         $this->_loginUser();
-        $expect = Backend::url("martin/forms/records");
+        $expect = Backend::url("blakejones/magicforms/records");
         $bh = new BackendHelpers();
         $this->assertEquals($expect, $bh->getBackendURL([
-            'martin.forms.access_records' => 'martin/forms/records',
-            'martin.forms.access_exports' => 'martin/forms/exports'
-        ], 'martin.forms.access_records'));
+            'blakejones.magicforms.access_records' => 'blakejones/magicforms/records',
+            'blakejones.magicforms.access_exports' => 'blakejones/magicforms/exports'
+        ], 'blakejones.magicforms.access_records'));
     }
 
     /**
diff --git a/tests/unit/classes/GDPRTest.php b/tests/unit/classes/GDPRTest.php
index 16c486d..51dcd9f 100644
--- a/tests/unit/classes/GDPRTest.php
+++ b/tests/unit/classes/GDPRTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Martin\Forms\Tests\Classes;
+namespace BlakeJones\MagicForms\Tests\Classes;
 
 use PluginTestCase;
 use Carbon\Carbon;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use System\Classes\PluginManager;
-use Martin\Forms\Classes\GDPR;
-use Martin\Forms\Models\Record;
-use Martin\Forms\Models\Settings;
+use BlakeJones\MagicForms\Classes\GDPR;
+use BlakeJones\MagicForms\Models\Record;
+use BlakeJones\MagicForms\Models\Settings;
 
 class GDPRTest extends PluginTestCase {
 
diff --git a/tests/unit/classes/UnreadRecordsTest.php b/tests/unit/classes/UnreadRecordsTest.php
index c195adb..5cfdee7 100644
--- a/tests/unit/classes/UnreadRecordsTest.php
+++ b/tests/unit/classes/UnreadRecordsTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Martin\Forms\Tests\Classes;
+namespace BlakeJones\MagicForms\Tests\Classes;
 
 use PluginTestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use System\Classes\PluginManager;
-use Martin\Forms\Classes\UnreadRecords;
-use Martin\Forms\Models\Record;
+use BlakeJones\MagicForms\Classes\UnreadRecords;
+use BlakeJones\MagicForms\Models\Record;
 
 class UnreadRecordsTest extends PluginTestCase {
 
diff --git a/traits/ComponentUtils.php b/traits/ComponentUtils.php
index 5c1fcfd..a38b1ce 100644
--- a/traits/ComponentUtils.php
+++ b/traits/ComponentUtils.php
@@ -1,4 +1,4 @@
-<?php namespace Martin\Forms\Traits;
+<?php namespace BlakeJones\MagicForms\Traits;
 
 use Input;
 use Request;
diff --git a/traits/FileUploader.php b/traits/FileUploader.php
index 08a2061..fdb0c77 100644
--- a/traits/FileUploader.php
+++ b/traits/FileUploader.php
@@ -1,4 +1,4 @@
-<?php namespace Martin\Forms\Traits;
+<?php namespace BlakeJones\MagicForms\Traits;
 
 use Input;
 use Cms\Classes\ComponentBase;
@@ -9,7 +9,7 @@
 trait FileUploader
 {
 
-    use \Martin\Forms\Traits\ComponentUtils;
+    use \BlakeJones\MagicForms\Traits\ComponentUtils;
 
     public $maxSize;
     public $placeholderText;
diff --git a/updates/add_group_field.php b/updates/add_group_field.php
index 1e3bf8d..5883a42 100644
--- a/updates/add_group_field.php
+++ b/updates/add_group_field.php
@@ -1,6 +1,6 @@
 <?php
 
-    namespace Martin\Forms\Updates;
+    namespace BlakeJones\MagicForms\Updates;
 
     use Schema;
     use October\Rain\Database\Updates\Migration;
@@ -8,15 +8,15 @@
     class AddGroupField extends Migration {
 
         public function up() {
-            Schema::table('martin_forms_records', function ($table) {
+            Schema::table('blakejones_magicforms_records', function ($table) {
                 $table->string('group')->default('(Empty)')->after('id');
             });
 
         }
 
         public function down() {
-            if(Schema::hasColumn('martin_forms_records', 'group')) {
-                Schema::table('martin_forms_records', function ($table) {
+            if(Schema::hasColumn('blakejones_magicforms_records', 'group')) {
+                Schema::table('blakejones_magicforms_records', function ($table) {
                     $table->dropColumn('group');
                 });
             }
diff --git a/updates/add_unread_field.php b/updates/add_unread_field.php
index 775b5b0..57f4cf3 100644
--- a/updates/add_unread_field.php
+++ b/updates/add_unread_field.php
@@ -1,17 +1,17 @@
 <?php
 
-    namespace Martin\Forms\Updates;
+    namespace BlakeJones\MagicForms\Updates;
 
     use Schema;
     use October\Rain\Database\Updates\Migration;
-    use Martin\Forms\Models\Record;
+    use BlakeJones\MagicForms\Models\Record;
 
     class AddUnreadField extends Migration {
 
         public function up() {
 
             // CREATE FIELD
-            Schema::table('martin_forms_records', function ($table) {
+            Schema::table('blakejones_magicforms_records', function ($table) {
                 $table->boolean('unread')->default(1)->after('ip');
             });
             
@@ -21,8 +21,8 @@ public function up() {
         }
 
         public function down() {
-            if(Schema::hasColumn('martin_forms_records', 'unread')) {
-                Schema::table('martin_forms_records', function ($table) {
+            if(Schema::hasColumn('blakejones_magicforms_records', 'unread')) {
+                Schema::table('blakejones_magicforms_records', function ($table) {
                     $table->dropColumn('unread');
                 });
             }
diff --git a/updates/create_records_table.php b/updates/create_records_table.php
index eb8cd8e..f8ae26b 100644
--- a/updates/create_records_table.php
+++ b/updates/create_records_table.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Martin\Forms\Updates;
+namespace BlakeJones\MagicForms\Updates;
 
 use Schema;
 use October\Rain\Database\Schema\Blueprint;
@@ -9,7 +9,7 @@
 class CreateRecordsTable extends Migration {
 
     public function up() {
-        Schema::create('martin_forms_records', function (Blueprint $table) {
+        Schema::create('blakejones_magicforms_records', function (Blueprint $table) {
             $table->engine = 'InnoDB';
             $table->increments('id');
             $table->text('form_data')->nullable();
@@ -20,7 +20,7 @@ public function up() {
     }
 
     public function down() {
-        Schema::dropIfExists('martin_forms_records');
+        Schema::dropIfExists('blakejones_magicforms_records');
     }
 
 }
diff --git a/updates/version.yaml b/updates/version.yaml
index 9e6814f..f8e23ec 100644
--- a/updates/version.yaml
+++ b/updates/version.yaml
@@ -1,130 +1,145 @@
-1.0.0:
-    - First version of Magic Forms
-    - create_records_table.php
-1.0.1:
-    - Added CSRF protection
-1.1.0:
-    - Added reCAPTCHA
-1.1.1:
-    - Fix when using reCAPTCHA + allowed fields
-1.1.2:
-    - Filter forms records
-    - Search inside stored data
-    - Organize your forms on custom groups
-    - add_group_field.php
-1.2.0:
-    - Export stored data in CSV format
-1.2.1:
-    - Auto-response email on form submit
-    - Added Turkish language
-1.2.2:
-    - Override notifications and auto-response email subjects
-1.2.3:
-    - New option to reset form after successfully submit
-    - Fixed Empty AJAX Form template
-    - Support for Translate plugin
-    - Added plugin documentation
-1.2.4:
-    - Added detailed reCAPTCHA help
-1.3.0:
-    - AJAX file uploads
-1.3.1:
-    - Added lang pt-br
-1.3.2:
-    - Fixed multiples reCAPTCHAs on same page
-1.3.3:
-    - Fixed record detail page when form data contains an array
-    - Updated documentations
-1.3.4:
-    - New "Anonymize IP" option
-1.3.5:
-    - New option "Redirect on successful submit"
-1.3.6:
-    - French translation
-    - Support Translate plugin on reCAPTCHA
-    - reCAPTCHA validation enhancements
-1.3.7:
-    - Displaying errors with fields (inline errors)
-    - Show uploads as list
-1.3.8:
-    - Fixed handling arrays (radio inputs) in notification email
-1.3.9:
-    - Use custom mail templates
-    - Execute custom JavaScript on form success or error
-1.4.0:
-    - Added Events (please, refer to docs) [thanks to therealkevinard]
-1.4.1:
-    - New option "Reply To"
-1.4.2:
-    - Escape HTML characters on the view records page [thanks to Andre]
-    - New option to sanitize form data (check security docs for more info)
-    - Added option to send blind carbon copy in notifications email
-1.4.3:
-    - Fixes related to October Build 420
-    - Added "Unread Records" counter
-    - Fixed errors when only BCC addresses are supplied
-    - New setting "hide navigation item"
-    - add_unread_field.php
-1.4.4:
-    - Use custom partials for Success and Error messages
-1.4.4.1:
-    - Fix with notifications emails
-1.4.5:
-    - Mail class code refactoring
-    - Access submited data on auto-response email template
-1.4.5.1:
-    - Store form data without escaping unicode [thanks to panakour]
-1.4.6:
-    - New option to skip saving forms data on database.
-    - Possibility to change the text on the remove file popup [thanks to ShiroeSama]
-1.4.6.1:
-    - Changed database field from json to text to support MySQL 5.5
-1.4.7:
-    - you can use your form variables on notification mail subject [thanks to Alex360hd]
-    - fix custom subject on email template [Thanks to matteotrubini]
-    - fix email bug when not storing on db [Thanks JurekRaben]
-    - skip url redirect validation [Thanks to EleRam]
-1.4.8:
-    - added GDPR cleanup feature [thanks to Alex360hd]
-1.4.9:
-    - fix on replaceToken function when replacement is null [thanks to leonaze]
-1.4.9.1:
-    - fix a nullable type error on PHP 7.0
-1.4.9.2:
-    - bugfix when a form field array has more than 2 levels of depth
-1.4.10:
-    - improvements related to event functionality
-1.4.11:
-    - added Laravel custom attributes to form validation [thanks to geekfil]
-    - updated french translation [thanks to FelixINX]
-1.4.12:
-    - use form variables on auto-response mail subject [thanks to jiargei]
-1.4.13:
-    - pass an array with form errors to JavaScript [thanks to multiwebinc]
-1.4.14:
-    - fixed error with empty auto-response subject
-1.4.15:
-    - enhancements related to saving record and events [thanks to boxxroom]
-1.4.16:
-    - added chinese translation [thanks to everyx]
-1.4.17:
-    - allowing sanitize to work recursively [thanks to multiwebinc]
-1.4.18:
-    - export records enhancements [thanks to Fosphatic]
-    - recaptcha locale fix [thanks to MaTToX3]
-1.4.19:
-    - added russian translation [thanks to FlusherDock1]
-    - sort records by date fix [thanks to mjauvin]
-1.4.20:
-    - added invisible reCAPTCHA [thanks to mjauvin]
-    - new option to set custom date format on emails subject
-1.5.0:
-    - fixes related to October Build 469 [thanks to mjauvin]
-    - fix when CSRF check is disabled [thanks to rechik]
-    - php linting and cleanup
-1.5.1:
-    - email templates improvemenrs [thanks to mjauvin]
-    - added german translation [thanks to Fosphatic]
-1.5.2:
-    - plugin published to packagist [thanks to rubenvanerk]
-    - added dutch translation [thanks to rubenvanerk]
+v1.0.0:
+  - First version of Magic Forms
+  - create_records_table.php
+v1.0.1:
+  - Added CSRF protection
+v1.1.0:
+  - Added reCAPTCHA
+v1.1.1:
+  - Fix when using reCAPTCHA + allowed fields
+v1.1.2:
+  - Filter forms records
+  - Search inside stored data
+  - Organize your forms on custom groups
+  - add_group_field.php
+v1.2.0:
+  - Export stored data in CSV format
+v1.2.1:
+  - Auto-response email on form submit
+  - Added Turkish language
+v1.2.2:
+  - Override notifications and auto-response email subjects
+v1.2.3:
+  - New option to reset form after successfully submit
+  - Fixed Empty AJAX Form template
+  - Support for Translate plugin
+  - Added plugin documentation
+v1.2.4:
+  - Added detailed reCAPTCHA help
+v1.3.0:
+  - AJAX file uploads
+v1.3.1:
+  - Added lang pt-br
+v1.3.2:
+  - Fixed multiples reCAPTCHAs on same page
+v1.3.3:
+  - Fixed record detail page when form data contains an array
+  - Updated documentations
+v1.3.4:
+  - New "Anonymize IP" option
+v1.3.5:
+  - New option "Redirect on successful submit"
+v1.3.6:
+  - French translation
+  - Support Translate plugin on reCAPTCHA
+  - reCAPTCHA validation enhancements
+v1.3.7:
+  - Displaying errors with fields (inline errors)
+  - Show uploads as list
+v1.3.8:
+  - Fixed handling arrays (radio inputs) in notification email
+v1.3.9:
+  - Use custom mail templates
+  - Execute custom JavaScript on form success or error
+v1.4.0:
+  - Added Events (please, refer to docs) [thanks to therealkevinard]
+v1.4.1:
+  - New option "Reply To"
+v1.4.2:
+  - Escape HTML characters on the view records page [thanks to Andre]
+  - New option to sanitize form data (check security docs for more info)
+  - Added option to send blind carbon copy in notifications email
+v1.4.3:
+  - Fixes related to October Build 420
+  - Added "Unread Records" counter
+  - Fixed errors when only BCC addresses are supplied
+  - New setting "hide navigation item"
+  - add_unread_field.php
+v1.4.4:
+  - Use custom partials for Success and Error messages
+v1.4.4.1:
+  - Fix with notifications emails
+v1.4.5:
+  - Mail class code refactoring
+  - Access submited data on auto-response email template
+v1.4.5.1:
+  - Store form data without escaping unicode [thanks to panakour]
+v1.4.6:
+  - New option to skip saving forms data on database.
+  - Possibility to change the text on the remove file popup [thanks to ShiroeSama]
+v1.4.6.1:
+  - Changed database field from json to text to support MySQL 5.5
+v1.4.7:
+  - you can use your form variables on notification mail subject [thanks to Alex360hd]
+  - fix custom subject on email template [Thanks to matteotrubini]
+  - fix email bug when not storing on db [Thanks JurekRaben]
+  - skip url redirect validation [Thanks to EleRam]
+v1.4.8:
+  - added GDPR cleanup feature [thanks to Alex360hd]
+v1.4.9:
+  - fix on replaceToken function when replacement is null [thanks to leonaze]
+v1.4.9.1:
+  - fix a nullable type error on PHP 7.0
+v1.4.9.2:
+  - bugfix when a form field array has more than 2 levels of depth
+v1.4.10:
+  - improvements related to event functionality
+v1.4.11:
+  - added Laravel custom attributes to form validation [thanks to geekfil]
+  - updated french translation [thanks to FelixINX]
+v1.4.12:
+  - use form variables on auto-response mail subject [thanks to jiargei]
+v1.4.13:
+  - pass an array with form errors to JavaScript [thanks to multiwebinc]
+v1.4.14:
+  - fixed error with empty auto-response subject
+v1.4.15:
+  - enhancements related to saving record and events [thanks to boxxroom]
+v1.4.16:
+  - added chinese translation [thanks to everyx]
+v1.4.17:
+  - allowing sanitize to work recursively [thanks to multiwebinc]
+v1.4.18:
+  - export records enhancements [thanks to Fosphatic]
+  - recaptcha locale fix [thanks to MaTToX3]
+v1.4.19:
+  - added russian translation [thanks to FlusherDock1]
+  - sort records by date fix [thanks to mjauvin]
+v1.4.20:
+  - added invisible reCAPTCHA [thanks to mjauvin]
+  - new option to set custom date format on emails subject
+v1.5.0:
+  - fixes related to October Build 469 [thanks to mjauvin]
+  - fix when CSRF check is disabled [thanks to rechik]
+  - php linting and cleanup
+v1.5.1:
+  - email templates improvemenrs [thanks to mjauvin]
+  - added german translation [thanks to Fosphatic]
+v1.5.2:
+  - plugin published to packagist [thanks to rubenvanerk]
+  - added dutch translation [thanks to rubenvanerk]
+v1.6.0:
+  - changed namespace
+  - Added support for October CMS v3
+v1.6.1:
+  - Fixes support for Translate v2 [thanks to daftspunk]
+v1.6.2:
+  - Fixed getting total count of records preventing install because the records table doesn't exist
+v1.6.3:
+  - Fixed needed use Schema for UnreadRecords class
+v1.6.4:
+  - Fixed error when trying to export when no records exist, Fixed menu context, Fixed main menu counter not updating
+v1.6.5:
+  - Fix for translate plugin [thanks to nnmer]
+v1.6.6:
+  - Fixes support for October CMS v3.6