diff --git a/LICENSE b/LICENSE
index 5edccce..9b79750 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2016 Adam Wathan <adam.wathan@gmail.com>
+Copyright (c) 2018 Samuel De Backer <sdebacker@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/composer.json b/composer.json
index 321fd8c..d6e1fdc 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,14 @@
 {
-    "name": "adamwathan/bootforms",
-    "description": "Just a Formbuilder with some Bootstrap specific conveniences. Remembers old input, retrieves error messages and handles all your boilerplate Bootstrap markup automatically.",
+    "name": "typicms/bootforms",
+    "description": "Just a Formbuilder with some Bootstrap 4 specific conveniences. Remembers old input, retrieves error messages and handles all your boilerplate Bootstrap markup automatically.",
     "authors": [
         {
             "name": "Adam Wathan",
             "email": "adam.wathan@gmail.com"
+        },
+        {
+            "name": "Samuel De Backer",
+            "email": "sdebacker@gmail.com"
         }
     ],
     "license": "MIT",
@@ -19,7 +23,7 @@
     },
     "autoload": {
         "psr-0": {
-            "AdamWathan\\BootForms": "src/"
+            "TypiCMS\\BootForms": "src/"
         }
     },
     "minimum-stability": "stable"
diff --git a/phpunit.xml b/phpunit.xml
index d312217..614b873 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -23,8 +23,8 @@
         <whitelist>
             <directory suffix=".php">./src</directory>
             <exclude>
-                <file>./src/AdamWathan/BootForms/BootFormsServiceProvider.php</file>
-                <file>./src/AdamWathan/BootForms/Facades/BootForm.php</file>
+                <file>./src/TypiCMS/BootForms/BootFormsServiceProvider.php</file>
+                <file>./src/TypiCMS/BootForms/Facades/BootForm.php</file>
             </exclude>
         </whitelist>
     </filter>
diff --git a/readme.md b/readme.md
index 84d825f..0cca84a 100644
--- a/readme.md
+++ b/readme.md
@@ -33,7 +33,7 @@ Modify the `providers` array in `config/app.php` to include the `BootFormsServic
 ```php
 'providers' => [
     //...
-    'AdamWathan\BootForms\BootFormsServiceProvider'
+    'TypiCMS\BootForms\BootFormsServiceProvider'
   ],
 ```
 
@@ -42,7 +42,7 @@ Add the `BootForm` facade to the `aliases` array in `config/app.php`:
 ```php
 'aliases' => [
     //...
-    'BootForm' => 'AdamWathan\BootForms\Facades\BootForm'
+    'BootForm' => 'TypiCMS\BootForms\Facades\BootForm'
   ],
 ```
 
@@ -63,10 +63,10 @@ $formBuilder->setOldInputProvider($myOldInputProvider);
 $formBuilder->setErrorStore($myErrorStore);
 $formBuilder->setToken($myCsrfToken);
 
-$basicBootFormsBuilder = new AdamWathan\BootForms\BasicFormBuilder($formBuilder);
-$horizontalBootFormsBuilder = new AdamWathan\BootForms\HorizontalFormBuilder($formBuilder);
+$basicBootFormsBuilder = new TypiCMS\BootForms\BasicFormBuilder($formBuilder);
+$horizontalBootFormsBuilder = new TypiCMS\BootForms\HorizontalFormBuilder($formBuilder);
 
-$bootForm = new AdamWathan\BootForms\BootForm($basicBootFormsBuilder, $horizontalBootFormsBuilder);
+$bootForm = new TypiCMS\BootForms\BootForm($basicBootFormsBuilder, $horizontalBootFormsBuilder);
 ```
 
 > Note: You must provide your own implementations of `AdamWathan\Form\OldInputInterface` and `AdamWathan\Form\ErrorStoreInterface` when not using the implementations meant for Laravel.
diff --git a/src/AdamWathan/BootForms/BasicFormBuilder.php b/src/TypiCMS/BootForms/BasicFormBuilder.php
similarity index 94%
rename from src/AdamWathan/BootForms/BasicFormBuilder.php
rename to src/TypiCMS/BootForms/BasicFormBuilder.php
index 190ff90..2c2d9ca 100644
--- a/src/AdamWathan/BootForms/BasicFormBuilder.php
+++ b/src/TypiCMS/BootForms/BasicFormBuilder.php
@@ -1,10 +1,10 @@
-<?php namespace AdamWathan\BootForms;
+<?php namespace TypiCMS\BootForms;
 
-use AdamWathan\BootForms\Elements\CheckGroup;
-use AdamWathan\BootForms\Elements\FormGroup;
-use AdamWathan\BootForms\Elements\GroupWrapper;
-use AdamWathan\BootForms\Elements\FormText;
-use AdamWathan\BootForms\Elements\InputGroup;
+use TypiCMS\BootForms\Elements\CheckGroup;
+use TypiCMS\BootForms\Elements\FormGroup;
+use TypiCMS\BootForms\Elements\GroupWrapper;
+use TypiCMS\BootForms\Elements\FormText;
+use TypiCMS\BootForms\Elements\InputGroup;
 use AdamWathan\Form\FormBuilder;
 
 class BasicFormBuilder
diff --git a/src/AdamWathan/BootForms/BootForm.php b/src/TypiCMS/BootForms/BootForm.php
similarity index 95%
rename from src/AdamWathan/BootForms/BootForm.php
rename to src/TypiCMS/BootForms/BootForm.php
index 5ba43e9..16a4797 100644
--- a/src/AdamWathan/BootForms/BootForm.php
+++ b/src/TypiCMS/BootForms/BootForm.php
@@ -1,4 +1,4 @@
-<?php namespace AdamWathan\BootForms;
+<?php namespace TypiCMS\BootForms;
 
 class BootForm
 {
diff --git a/src/AdamWathan/BootForms/BootFormsServiceProvider.php b/src/TypiCMS/BootForms/BootFormsServiceProvider.php
similarity index 95%
rename from src/AdamWathan/BootForms/BootFormsServiceProvider.php
rename to src/TypiCMS/BootForms/BootFormsServiceProvider.php
index c6ed5f2..576b783 100644
--- a/src/AdamWathan/BootForms/BootFormsServiceProvider.php
+++ b/src/TypiCMS/BootForms/BootFormsServiceProvider.php
@@ -1,4 +1,4 @@
-<?php namespace AdamWathan\BootForms;
+<?php namespace TypiCMS\BootForms;
 
 use AdamWathan\Form\ErrorStore\IlluminateErrorStore;
 use AdamWathan\Form\FormBuilder;
diff --git a/src/AdamWathan/BootForms/Elements/CheckGroup.php b/src/TypiCMS/BootForms/Elements/CheckGroup.php
similarity index 95%
rename from src/AdamWathan/BootForms/Elements/CheckGroup.php
rename to src/TypiCMS/BootForms/Elements/CheckGroup.php
index 76c93be..1922d0f 100644
--- a/src/AdamWathan/BootForms/Elements/CheckGroup.php
+++ b/src/TypiCMS/BootForms/Elements/CheckGroup.php
@@ -1,4 +1,4 @@
-<?php namespace AdamWathan\BootForms\Elements;
+<?php namespace TypiCMS\BootForms\Elements;
 
 use AdamWathan\Form\Elements\Element;
 use AdamWathan\Form\Elements\Label;
diff --git a/src/AdamWathan/BootForms/Elements/FormGroup.php b/src/TypiCMS/BootForms/Elements/FormGroup.php
similarity index 97%
rename from src/AdamWathan/BootForms/Elements/FormGroup.php
rename to src/TypiCMS/BootForms/Elements/FormGroup.php
index 068fb35..ae653cd 100644
--- a/src/AdamWathan/BootForms/Elements/FormGroup.php
+++ b/src/TypiCMS/BootForms/Elements/FormGroup.php
@@ -1,4 +1,4 @@
-<?php namespace AdamWathan\BootForms\Elements;
+<?php namespace TypiCMS\BootForms\Elements;
 
 use AdamWathan\Form\Elements\Element;
 use AdamWathan\Form\Elements\Label;
diff --git a/src/AdamWathan/BootForms/Elements/FormText.php b/src/TypiCMS/BootForms/Elements/FormText.php
similarity index 90%
rename from src/AdamWathan/BootForms/Elements/FormText.php
rename to src/TypiCMS/BootForms/Elements/FormText.php
index 0fc6b92..01ec116 100644
--- a/src/AdamWathan/BootForms/Elements/FormText.php
+++ b/src/TypiCMS/BootForms/Elements/FormText.php
@@ -1,4 +1,4 @@
-<?php namespace AdamWathan\BootForms\Elements;
+<?php namespace TypiCMS\BootForms\Elements;
 
 use AdamWathan\Form\Elements\Element;
 
diff --git a/src/AdamWathan/BootForms/Elements/GroupWrapper.php b/src/TypiCMS/BootForms/Elements/GroupWrapper.php
similarity index 97%
rename from src/AdamWathan/BootForms/Elements/GroupWrapper.php
rename to src/TypiCMS/BootForms/Elements/GroupWrapper.php
index bca265c..7670580 100644
--- a/src/AdamWathan/BootForms/Elements/GroupWrapper.php
+++ b/src/TypiCMS/BootForms/Elements/GroupWrapper.php
@@ -1,4 +1,4 @@
-<?php namespace AdamWathan\BootForms\Elements;
+<?php namespace TypiCMS\BootForms\Elements;
 
 use AdamWathan\Form\Elements\Label;
 
diff --git a/src/AdamWathan/BootForms/Elements/HorizontalFormGroup.php b/src/TypiCMS/BootForms/Elements/HorizontalFormGroup.php
similarity index 96%
rename from src/AdamWathan/BootForms/Elements/HorizontalFormGroup.php
rename to src/TypiCMS/BootForms/Elements/HorizontalFormGroup.php
index caee1f5..b4739b1 100644
--- a/src/AdamWathan/BootForms/Elements/HorizontalFormGroup.php
+++ b/src/TypiCMS/BootForms/Elements/HorizontalFormGroup.php
@@ -1,4 +1,4 @@
-<?php namespace AdamWathan\BootForms\Elements;
+<?php namespace TypiCMS\BootForms\Elements;
 
 use AdamWathan\Form\Elements\Element;
 use AdamWathan\Form\Elements\Label;
diff --git a/src/AdamWathan/BootForms/Elements/InputGroup.php b/src/TypiCMS/BootForms/Elements/InputGroup.php
similarity index 95%
rename from src/AdamWathan/BootForms/Elements/InputGroup.php
rename to src/TypiCMS/BootForms/Elements/InputGroup.php
index 6cadad8..069bd54 100644
--- a/src/AdamWathan/BootForms/Elements/InputGroup.php
+++ b/src/TypiCMS/BootForms/Elements/InputGroup.php
@@ -1,4 +1,4 @@
-<?php namespace AdamWathan\BootForms\Elements;
+<?php namespace TypiCMS\BootForms\Elements;
 
 use AdamWathan\Form\Elements\Text;
 
diff --git a/src/AdamWathan/BootForms/Elements/InvalidFeedback.php b/src/TypiCMS/BootForms/Elements/InvalidFeedback.php
similarity index 90%
rename from src/AdamWathan/BootForms/Elements/InvalidFeedback.php
rename to src/TypiCMS/BootForms/Elements/InvalidFeedback.php
index cca2af1..ade6612 100644
--- a/src/AdamWathan/BootForms/Elements/InvalidFeedback.php
+++ b/src/TypiCMS/BootForms/Elements/InvalidFeedback.php
@@ -1,4 +1,4 @@
-<?php namespace AdamWathan\BootForms\Elements;
+<?php namespace TypiCMS\BootForms\Elements;
 
 use AdamWathan\Form\Elements\Element;
 
diff --git a/src/AdamWathan/BootForms/Elements/OffsetFormGroup.php b/src/TypiCMS/BootForms/Elements/OffsetFormGroup.php
similarity index 96%
rename from src/AdamWathan/BootForms/Elements/OffsetFormGroup.php
rename to src/TypiCMS/BootForms/Elements/OffsetFormGroup.php
index 21d2903..7eea20c 100644
--- a/src/AdamWathan/BootForms/Elements/OffsetFormGroup.php
+++ b/src/TypiCMS/BootForms/Elements/OffsetFormGroup.php
@@ -1,4 +1,4 @@
-<?php namespace AdamWathan\BootForms\Elements;
+<?php namespace TypiCMS\BootForms\Elements;
 
 class OffsetFormGroup
 {
diff --git a/src/AdamWathan/BootForms/Facades/BootForm.php b/src/TypiCMS/BootForms/Facades/BootForm.php
similarity index 84%
rename from src/AdamWathan/BootForms/Facades/BootForm.php
rename to src/TypiCMS/BootForms/Facades/BootForm.php
index b5a474e..2b41c36 100644
--- a/src/AdamWathan/BootForms/Facades/BootForm.php
+++ b/src/TypiCMS/BootForms/Facades/BootForm.php
@@ -1,4 +1,4 @@
-<?php namespace AdamWathan\BootForms\Facades;
+<?php namespace TypiCMS\BootForms\Facades;
 
 use Illuminate\Support\Facades\Facade;
 
diff --git a/src/AdamWathan/BootForms/HorizontalFormBuilder.php b/src/TypiCMS/BootForms/HorizontalFormBuilder.php
similarity index 94%
rename from src/AdamWathan/BootForms/HorizontalFormBuilder.php
rename to src/TypiCMS/BootForms/HorizontalFormBuilder.php
index ab74c87..f0b60ef 100644
--- a/src/AdamWathan/BootForms/HorizontalFormBuilder.php
+++ b/src/TypiCMS/BootForms/HorizontalFormBuilder.php
@@ -1,9 +1,9 @@
-<?php namespace AdamWathan\BootForms;
+<?php namespace TypiCMS\BootForms;
 
-use AdamWathan\BootForms\Elements\CheckGroup;
-use AdamWathan\BootForms\Elements\FormText;
-use AdamWathan\BootForms\Elements\HorizontalFormGroup;
-use AdamWathan\BootForms\Elements\OffsetFormGroup;
+use TypiCMS\BootForms\Elements\CheckGroup;
+use TypiCMS\BootForms\Elements\FormText;
+use TypiCMS\BootForms\Elements\HorizontalFormGroup;
+use TypiCMS\BootForms\Elements\OffsetFormGroup;
 use AdamWathan\Form\FormBuilder;
 
 class HorizontalFormBuilder extends BasicFormBuilder
diff --git a/tests/BasicFormBuilderTest.php b/tests/BasicFormBuilderTest.php
index adb223e..3ffcdb0 100644
--- a/tests/BasicFormBuilderTest.php
+++ b/tests/BasicFormBuilderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use AdamWathan\BootForms\BasicFormBuilder;
+use TypiCMS\BootForms\BasicFormBuilder;
 use AdamWathan\Form\FormBuilder;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/FormGroupTest.php b/tests/FormGroupTest.php
index e24b0d6..f492e07 100644
--- a/tests/FormGroupTest.php
+++ b/tests/FormGroupTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use AdamWathan\BootForms\Elements\FormGroup;
+use TypiCMS\BootForms\Elements\FormGroup;
 use AdamWathan\Form\FormBuilder;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/FormTextTest.php b/tests/FormTextTest.php
index a302151..089a02a 100644
--- a/tests/FormTextTest.php
+++ b/tests/FormTextTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use AdamWathan\BootForms\Elements\FormText;
+use TypiCMS\BootForms\Elements\FormText;
 use PHPUnit\Framework\TestCase;
 
 class FormTextTest extends TestCase
diff --git a/tests/HorizontalFormBuilderTest.php b/tests/HorizontalFormBuilderTest.php
index 974070e..df82a9f 100644
--- a/tests/HorizontalFormBuilderTest.php
+++ b/tests/HorizontalFormBuilderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use AdamWathan\BootForms\HorizontalFormBuilder;
+use TypiCMS\BootForms\HorizontalFormBuilder;
 use AdamWathan\Form\FormBuilder;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/InputGroupTest.php b/tests/InputGroupTest.php
index d124190..b5e000d 100644
--- a/tests/InputGroupTest.php
+++ b/tests/InputGroupTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use AdamWathan\BootForms\Elements\InputGroup;
+use TypiCMS\BootForms\Elements\InputGroup;
 use PHPUnit\Framework\TestCase;
 
 class InputGroupTest extends TestCase
diff --git a/tests/InvalidFeedbackTest.php b/tests/InvalidFeedbackTest.php
index e62b869..efd42fb 100644
--- a/tests/InvalidFeedbackTest.php
+++ b/tests/InvalidFeedbackTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use AdamWathan\BootForms\Elements\InvalidFeedback;
+use TypiCMS\BootForms\Elements\InvalidFeedback;
 use PHPUnit\Framework\TestCase;
 
 class InvalidFeedbackTest extends TestCase