diff --git a/composer.json b/composer.json
index 1e4e728..7baa82b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "stackkit/laravel-database-emails",
+    "name": "buildcode/laravel-database-emails",
     "description": "Store and send e-mails using the database",
     "license": "MIT",
     "authors": [
@@ -10,7 +10,7 @@
     ],
     "autoload": {
         "psr-4": {
-            "Stackkit\\LaravelDatabaseEmails\\": "src/"
+            "Buildcode\\LaravelDatabaseEmails\\": "src/"
         }
     },
     "autoload-dev": {
@@ -21,7 +21,7 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Stackkit\\LaravelDatabaseEmails\\LaravelDatabaseEmailsServiceProvider"
+                "Buildcode\\LaravelDatabaseEmails\\LaravelDatabaseEmailsServiceProvider"
             ]
         }
     },
diff --git a/src/Config.php b/src/Config.php
index 8e81d61..a31e727 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stackkit\LaravelDatabaseEmails;
+namespace Buildcode\LaravelDatabaseEmails;
 
 class Config
 {
diff --git a/src/Email.php b/src/Email.php
index 4989bb4..ac20625 100644
--- a/src/Email.php
+++ b/src/Email.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stackkit\LaravelDatabaseEmails;
+namespace Buildcode\LaravelDatabaseEmails;
 
 use Exception;
 use Carbon\Carbon;
@@ -204,7 +204,7 @@ public function getSubject()
      */
     public function getSubjectAttribute()
     {
-        return $this->view;
+        return $this->subject;
     }
 
     /**
diff --git a/src/EmailComposer.php b/src/EmailComposer.php
index c7f6546..502a443 100644
--- a/src/EmailComposer.php
+++ b/src/EmailComposer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stackkit\LaravelDatabaseEmails;
+namespace Buildcode\LaravelDatabaseEmails;
 
 use Illuminate\Mail\Mailable;
 
diff --git a/src/Encrypter.php b/src/Encrypter.php
index c0438a5..ee20a8e 100644
--- a/src/Encrypter.php
+++ b/src/Encrypter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stackkit\LaravelDatabaseEmails;
+namespace Buildcode\LaravelDatabaseEmails;
 
 class Encrypter
 {
diff --git a/src/HasEncryptedAttributes.php b/src/HasEncryptedAttributes.php
index ce782ac..d461db0 100644
--- a/src/HasEncryptedAttributes.php
+++ b/src/HasEncryptedAttributes.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stackkit\LaravelDatabaseEmails;
+namespace Buildcode\LaravelDatabaseEmails;
 
 use Illuminate\Contracts\Encryption\DecryptException;
 
diff --git a/src/LaravelDatabaseEmailsServiceProvider.php b/src/LaravelDatabaseEmailsServiceProvider.php
index 56a3f58..80cbb29 100644
--- a/src/LaravelDatabaseEmailsServiceProvider.php
+++ b/src/LaravelDatabaseEmailsServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stackkit\LaravelDatabaseEmails;
+namespace Buildcode\LaravelDatabaseEmails;
 
 use Illuminate\Support\ServiceProvider;
 
diff --git a/src/MailableReader.php b/src/MailableReader.php
index 0497bd2..90f649b 100644
--- a/src/MailableReader.php
+++ b/src/MailableReader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stackkit\LaravelDatabaseEmails;
+namespace Buildcode\LaravelDatabaseEmails;
 
 use Exception;
 use function call_user_func_array;
diff --git a/src/Preparer.php b/src/Preparer.php
index b2d69ac..793e8fa 100644
--- a/src/Preparer.php
+++ b/src/Preparer.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stackkit\LaravelDatabaseEmails;
+namespace Buildcode\LaravelDatabaseEmails;
 
 use Carbon\Carbon;
 
diff --git a/src/ResendEmailsCommand.php b/src/ResendEmailsCommand.php
index 899c674..4ae8f8c 100644
--- a/src/ResendEmailsCommand.php
+++ b/src/ResendEmailsCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stackkit\LaravelDatabaseEmails;
+namespace Buildcode\LaravelDatabaseEmails;
 
 class ResendEmailsCommand extends RetryFailedEmailsCommand
 {
diff --git a/src/RetryFailedEmailsCommand.php b/src/RetryFailedEmailsCommand.php
index 90e2596..e6764af 100644
--- a/src/RetryFailedEmailsCommand.php
+++ b/src/RetryFailedEmailsCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stackkit\LaravelDatabaseEmails;
+namespace Buildcode\LaravelDatabaseEmails;
 
 use Illuminate\Console\Command;
 
diff --git a/src/SendEmailsCommand.php b/src/SendEmailsCommand.php
index 57626de..9588ab1 100644
--- a/src/SendEmailsCommand.php
+++ b/src/SendEmailsCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stackkit\LaravelDatabaseEmails;
+namespace Buildcode\LaravelDatabaseEmails;
 
 use Exception;
 use Illuminate\Console\Command;
diff --git a/src/Sender.php b/src/Sender.php
index 8d74471..672dd66 100644
--- a/src/Sender.php
+++ b/src/Sender.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stackkit\LaravelDatabaseEmails;
+namespace Buildcode\LaravelDatabaseEmails;
 
 use Illuminate\Mail\Mailer;
 use Illuminate\Mail\Message;
diff --git a/src/Store.php b/src/Store.php
index 824eaf4..9fc73c0 100644
--- a/src/Store.php
+++ b/src/Store.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stackkit\LaravelDatabaseEmails;
+namespace Buildcode\LaravelDatabaseEmails;
 
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Collection;
diff --git a/src/Validator.php b/src/Validator.php
index 2a3113a..2505ff1 100644
--- a/src/Validator.php
+++ b/src/Validator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Stackkit\LaravelDatabaseEmails;
+namespace Buildcode\LaravelDatabaseEmails;
 
 use Exception;
 use Carbon\Carbon;
diff --git a/tests/MailableReaderTest.php b/tests/MailableReaderTest.php
index 34aa814..f60ff8a 100644
--- a/tests/MailableReaderTest.php
+++ b/tests/MailableReaderTest.php
@@ -3,7 +3,7 @@
 namespace Tests;
 
 use Illuminate\Mail\Mailable;
-use Stackkit\LaravelDatabaseEmails\Email;
+use Buildcode\LaravelDatabaseEmails\Email;
 
 class MailableReaderTest extends TestCase
 {
diff --git a/tests/SendEmailsCommandTest.php b/tests/SendEmailsCommandTest.php
index 25a6802..1d3e3e0 100644
--- a/tests/SendEmailsCommandTest.php
+++ b/tests/SendEmailsCommandTest.php
@@ -4,7 +4,7 @@
 
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
-use Stackkit\LaravelDatabaseEmails\Store;
+use Buildcode\LaravelDatabaseEmails\Store;
 
 class SendEmailsCommandTest extends TestCase
 {
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 4fdc19a..f2d5679 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -3,7 +3,7 @@
 namespace Tests;
 
 use Eloquent;
-use Stackkit\LaravelDatabaseEmails\Email;
+use Buildcode\LaravelDatabaseEmails\Email;
 
 class TestCase extends \Orchestra\Testbench\TestCase
 {
@@ -66,7 +66,7 @@ protected function getPackageProviders($app)
     {
         return [
             \Orchestra\Database\ConsoleServiceProvider::class,
-            \Stackkit\LaravelDatabaseEmails\LaravelDatabaseEmailsServiceProvider::class,
+            \Buildcode\LaravelDatabaseEmails\LaravelDatabaseEmailsServiceProvider::class,
         ];
     }
 
diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php
index 2aab662..78a26e4 100644
--- a/tests/ValidatorTest.php
+++ b/tests/ValidatorTest.php
@@ -4,7 +4,7 @@
 
 use Carbon;
 use InvalidArgumentException;
-use Stackkit\LaravelDatabaseEmails\Email;
+use Buildcode\LaravelDatabaseEmails\Email;
 
 class ValidatorTest extends TestCase
 {