diff --git a/app/lib/FireflyIII/Database/Account/Account.php b/app/lib/FireflyIII/Database/Account/Account.php
index 10ebbf5406..e1ba05daa0 100644
--- a/app/lib/FireflyIII/Database/Account/Account.php
+++ b/app/lib/FireflyIII/Database/Account/Account.php
@@ -3,8 +3,8 @@
 namespace FireflyIII\Database\Account;
 
 use Carbon\Carbon;
-use FireflyIII\Database\CommonDatabaseCalls;
-use FireflyIII\Database\CUD;
+use FireflyIII\Database\CommonDatabaseCallsInterface;
+use FireflyIII\Database\CUDInterface;
 use FireflyIII\Database\SwitchUser;
 use FireflyIII\Exception\NotImplementedException;
 use Illuminate\Database\Eloquent\Builder;
@@ -18,7 +18,7 @@ use Illuminate\Support\MessageBag;
  * @package    FireflyIII\Database
  * @implements FireflyIII\Database\Account\AccountInterface
  */
-class Account implements CUD, CommonDatabaseCalls, AccountInterface
+class Account implements CUDInterface, CommonDatabaseCallsInterface, AccountInterface
 {
     use SwitchUser;
 
@@ -661,4 +661,4 @@ class Account implements CUD, CommonDatabaseCalls, AccountInterface
     }
 
 
-}
\ No newline at end of file
+}
diff --git a/app/lib/FireflyIII/Database/AccountType/AccountType.php b/app/lib/FireflyIII/Database/AccountType/AccountType.php
index c3b8856f6a..8b3edbb2a0 100644
--- a/app/lib/FireflyIII/Database/AccountType/AccountType.php
+++ b/app/lib/FireflyIII/Database/AccountType/AccountType.php
@@ -2,8 +2,8 @@
 
 namespace FireflyIII\Database\AccountType;
 
-use FireflyIII\Database\CommonDatabaseCalls;
-use FireflyIII\Database\CUD;
+use FireflyIII\Database\CommonDatabaseCallsInterface;
+use FireflyIII\Database\CUDInterface;
 use FireflyIII\Exception\FireflyException;
 use FireflyIII\Exception\NotImplementedException;
 use Illuminate\Database\Eloquent\Model as Eloquent;
@@ -14,7 +14,7 @@ use Illuminate\Support\Collection;
  *
  * @package FireflyIII\Database
  */
-class AccountType implements CUD, CommonDatabaseCalls
+class AccountType implements CUDInterface, CommonDatabaseCallsInterface
 {
 
     /**
diff --git a/app/lib/FireflyIII/Database/Bill/Bill.php b/app/lib/FireflyIII/Database/Bill/Bill.php
index 6cb839c653..3d0c445a4f 100644
--- a/app/lib/FireflyIII/Database/Bill/Bill.php
+++ b/app/lib/FireflyIII/Database/Bill/Bill.php
@@ -4,8 +4,8 @@ namespace FireflyIII\Database\Bill;
 
 
 use Carbon\Carbon;
-use FireflyIII\Database\CommonDatabaseCalls;
-use FireflyIII\Database\CUD;
+use FireflyIII\Database\CommonDatabaseCallsInterface;
+use FireflyIII\Database\CUDInterface;
 use FireflyIII\Database\SwitchUser;
 use FireflyIII\Exception\NotImplementedException;
 use Illuminate\Database\Eloquent\Model as Eloquent;
@@ -17,7 +17,7 @@ use Illuminate\Support\MessageBag;
  *
  * @package FireflyIII\Database
  */
-class Bill implements CUD, CommonDatabaseCalls, BillInterface
+class Bill implements CUDInterface, CommonDatabaseCallsInterface, BillInterface
 {
     use SwitchUser;
 
diff --git a/app/lib/FireflyIII/Database/Budget/Budget.php b/app/lib/FireflyIII/Database/Budget/Budget.php
index 2717a58f11..7c1dd85d3f 100644
--- a/app/lib/FireflyIII/Database/Budget/Budget.php
+++ b/app/lib/FireflyIII/Database/Budget/Budget.php
@@ -2,8 +2,8 @@
 namespace FireflyIII\Database\Budget;
 
 use Carbon\Carbon;
-use FireflyIII\Database\CommonDatabaseCalls;
-use FireflyIII\Database\CUD;
+use FireflyIII\Database\CommonDatabaseCallsInterface;
+use FireflyIII\Database\CUDInterface;
 use FireflyIII\Database\SwitchUser;
 use FireflyIII\Exception\FireflyException;
 use FireflyIII\Exception\NotImplementedException;
@@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Builder;
  *
  * @package FireflyIII\Database
  */
-class Budget implements CUD, CommonDatabaseCalls, BudgetInterface
+class Budget implements CUDInterface, CommonDatabaseCallsInterface, BudgetInterface
 {
     use SwitchUser;
 
diff --git a/app/lib/FireflyIII/Database/CUD.php b/app/lib/FireflyIII/Database/CUDInterface.php
similarity index 96%
rename from app/lib/FireflyIII/Database/CUD.php
rename to app/lib/FireflyIII/Database/CUDInterface.php
index 5178f5c474..e9bd6d033f 100644
--- a/app/lib/FireflyIII/Database/CUD.php
+++ b/app/lib/FireflyIII/Database/CUDInterface.php
@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Model as Eloquent;
  *
  * @package FireflyIII\Database
  */
-interface CUD
+interface CUDInterface
 {
 
     /**
diff --git a/app/lib/FireflyIII/Database/Category/Category.php b/app/lib/FireflyIII/Database/Category/Category.php
index dd0167aaf9..c24db39754 100644
--- a/app/lib/FireflyIII/Database/Category/Category.php
+++ b/app/lib/FireflyIII/Database/Category/Category.php
@@ -2,8 +2,8 @@
 namespace FireflyIII\Database\Category;
 
 use Carbon\Carbon;
-use FireflyIII\Database\CommonDatabaseCalls;
-use FireflyIII\Database\CUD;
+use FireflyIII\Database\CommonDatabaseCallsInterface;
+use FireflyIII\Database\CUDInterface;
 use FireflyIII\Database\SwitchUser;
 use FireflyIII\Exception\FireflyException;
 use FireflyIII\Exception\NotImplementedException;
@@ -16,7 +16,7 @@ use Illuminate\Support\MessageBag;
  *
  * @package FireflyIII\Database
  */
-class Category implements CUD, CommonDatabaseCalls
+class Category implements CUDInterface, CommonDatabaseCallsInterface
 {
     use SwitchUser;
 
diff --git a/app/lib/FireflyIII/Database/CommonDatabaseCalls.php b/app/lib/FireflyIII/Database/CommonDatabaseCallsInterface.php
similarity index 95%
rename from app/lib/FireflyIII/Database/CommonDatabaseCalls.php
rename to app/lib/FireflyIII/Database/CommonDatabaseCallsInterface.php
index ba3bf5d6c7..4842eaaf88 100644
--- a/app/lib/FireflyIII/Database/CommonDatabaseCalls.php
+++ b/app/lib/FireflyIII/Database/CommonDatabaseCallsInterface.php
@@ -10,7 +10,7 @@ use Illuminate\Support\Collection;
  *
  * @package FireflyIII\Database
  */
-interface CommonDatabaseCalls
+interface CommonDatabaseCallsInterface
 {
     /**
      * Returns an object with id $id.
diff --git a/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php b/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php
index bfcdaf66a5..def8a57596 100644
--- a/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php
+++ b/app/lib/FireflyIII/Database/PiggyBank/PiggyBank.php
@@ -2,8 +2,8 @@
 namespace FireflyIII\Database\PiggyBank;
 
 use Carbon\Carbon;
-use FireflyIII\Database\CommonDatabaseCalls;
-use FireflyIII\Database\CUD;
+use FireflyIII\Database\CommonDatabaseCallsInterface;
+use FireflyIII\Database\CUDInterface;
 use FireflyIII\Exception\FireflyException;
 use FireflyIII\Exception\NotImplementedException;
 use Illuminate\Support\Collection;
@@ -13,7 +13,7 @@ use Illuminate\Support\Collection;
  *
  * @package FireflyIII\Database
  */
-class PiggyBank extends PiggyBankShared implements CUD, CommonDatabaseCalls, PiggyBankInterface
+class PiggyBank extends PiggyBankShared implements CUDInterface, CommonDatabaseCallsInterface, PiggyBankInterface
 {
     /**
      * @param \PiggyBank $piggyBank
diff --git a/app/lib/FireflyIII/Database/PiggyBank/RepeatedExpense.php b/app/lib/FireflyIII/Database/PiggyBank/RepeatedExpense.php
index 2c11ff2d2f..b6d4a2d837 100644
--- a/app/lib/FireflyIII/Database/PiggyBank/RepeatedExpense.php
+++ b/app/lib/FireflyIII/Database/PiggyBank/RepeatedExpense.php
@@ -4,8 +4,8 @@ namespace FireflyIII\Database\PiggyBank;
 
 
 use FireflyIII\Collection\PiggyBankPart;
-use FireflyIII\Database\CommonDatabaseCalls;
-use FireflyIII\Database\CUD;
+use FireflyIII\Database\CommonDatabaseCallsInterface;
+use FireflyIII\Database\CUDInterface;
 use Illuminate\Support\Collection;
 
 /**
@@ -13,7 +13,7 @@ use Illuminate\Support\Collection;
  *
  * @package FireflyIII\Database
  */
-class RepeatedExpense extends PiggyBankShared implements CUD, CommonDatabaseCalls, PiggyBankInterface
+class RepeatedExpense extends PiggyBankShared implements CUDInterface, CommonDatabaseCallsInterface, PiggyBankInterface
 {
 
     /**
diff --git a/app/lib/FireflyIII/Database/Transaction/Transaction.php b/app/lib/FireflyIII/Database/Transaction/Transaction.php
index 27dd9c6e39..1f961bbb13 100644
--- a/app/lib/FireflyIII/Database/Transaction/Transaction.php
+++ b/app/lib/FireflyIII/Database/Transaction/Transaction.php
@@ -2,8 +2,8 @@
 
 namespace FireflyIII\Database\Transaction;
 
-use FireflyIII\Database\CommonDatabaseCalls;
-use FireflyIII\Database\CUD;
+use FireflyIII\Database\CommonDatabaseCallsInterface;
+use FireflyIII\Database\CUDInterface;
 use FireflyIII\Database\SwitchUser;
 use FireflyIII\Exception\FireflyException;
 use FireflyIII\Exception\NotImplementedException;
@@ -16,7 +16,7 @@ use Illuminate\Support\MessageBag;
  *
  * @package FireflyIII\Database
  */
-class Transaction implements CUD, CommonDatabaseCalls
+class Transaction implements CUDInterface, CommonDatabaseCallsInterface
 {
     use SwitchUser;
 
diff --git a/app/lib/FireflyIII/Database/TransactionCurrency/TransactionCurrency.php b/app/lib/FireflyIII/Database/TransactionCurrency/TransactionCurrency.php
index 0c1360aa97..23edb31496 100644
--- a/app/lib/FireflyIII/Database/TransactionCurrency/TransactionCurrency.php
+++ b/app/lib/FireflyIII/Database/TransactionCurrency/TransactionCurrency.php
@@ -2,8 +2,8 @@
 
 namespace FireflyIII\Database\TransactionCurrency;
 
-use FireflyIII\Database\CommonDatabaseCalls;
-use FireflyIII\Database\CUD;
+use FireflyIII\Database\CommonDatabaseCallsInterface;
+use FireflyIII\Database\CUDInterface;
 use FireflyIII\Exception\NotImplementedException;
 use Illuminate\Database\Eloquent\Model as Eloquent;
 use Illuminate\Support\Collection;
@@ -14,7 +14,7 @@ use Illuminate\Support\MessageBag;
  *
  * @package FireflyIII\Database
  */
-class TransactionCurrency implements TransactionCurrencyInterface, CommonDatabaseCalls, CUD
+class TransactionCurrency implements TransactionCurrencyInterface, CommonDatabaseCallsInterface, CUDInterface
 {
 
     /**
diff --git a/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php b/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php
index 72e8fc10ea..77f91c3812 100644
--- a/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php
+++ b/app/lib/FireflyIII/Database/TransactionJournal/TransactionJournal.php
@@ -4,8 +4,8 @@ namespace FireflyIII\Database\TransactionJournal;
 
 
 use Carbon\Carbon;
-use FireflyIII\Database\CommonDatabaseCalls;
-use FireflyIII\Database\CUD;
+use FireflyIII\Database\CommonDatabaseCallsInterface;
+use FireflyIII\Database\CUDInterface;
 use FireflyIII\Database\SwitchUser;
 use FireflyIII\Exception\FireflyException;
 use FireflyIII\Exception\NotImplementedException;
@@ -18,7 +18,7 @@ use Illuminate\Support\MessageBag;
  *
  * @package FireflyIII\Database
  */
-class TransactionJournal implements TransactionJournalInterface, CUD, CommonDatabaseCalls
+class TransactionJournal implements TransactionJournalInterface, CUDInterface, CommonDatabaseCallsInterface
 {
     use SwitchUser;
 
diff --git a/app/lib/FireflyIII/Database/TransactionType/TransactionType.php b/app/lib/FireflyIII/Database/TransactionType/TransactionType.php
index e2bb47c1ab..199e94a1df 100644
--- a/app/lib/FireflyIII/Database/TransactionType/TransactionType.php
+++ b/app/lib/FireflyIII/Database/TransactionType/TransactionType.php
@@ -3,8 +3,8 @@
 namespace FireflyIII\Database\TransactionType;
 
 
-use FireflyIII\Database\CommonDatabaseCalls;
-use FireflyIII\Database\CUD;
+use FireflyIII\Database\CommonDatabaseCallsInterface;
+use FireflyIII\Database\CUDInterface;
 use FireflyIII\Exception\FireflyException;
 use FireflyIII\Exception\NotImplementedException;
 use Illuminate\Database\Eloquent\Model as Eloquent;
@@ -16,7 +16,7 @@ use Illuminate\Support\Collection;
  *
  * @package FireflyIII\Database
  */
-class TransactionType implements CUD, CommonDatabaseCalls
+class TransactionType implements CUDInterface, CommonDatabaseCallsInterface
 {
 
     /**
diff --git a/app/lib/FireflyIII/Shared/Mail/Registration.php b/app/lib/FireflyIII/Shared/Mail/Registration.php
index af771ff265..f73c835ef5 100644
--- a/app/lib/FireflyIII/Shared/Mail/Registration.php
+++ b/app/lib/FireflyIII/Shared/Mail/Registration.php
@@ -2,7 +2,7 @@
 namespace FireflyIII\Shared\Mail;
 
 use Swift_RfcComplianceException;
-
+use Illuminate\Mail\Message;
 /**
  * Class Registration
  *
@@ -28,7 +28,8 @@ class Registration implements RegistrationInterface
         $data = ['password' => $password];
         try {
             \Mail::send(
-                ['emails.user.register-html', 'emails.user.register-text'], $data, function ($message) use ($email) {
+                ['emails.user.register-html', 'emails.user.register-text'], $data, function (Message $message) use ($email) {
+
                 $message->to($email, $email)->subject('Welcome to Firefly!');
             }
             );
@@ -51,7 +52,7 @@ class Registration implements RegistrationInterface
         $data = ['reset' => $reset];
         try {
             \Mail::send(
-                ['emails.user.remindMe-html', 'emails.user.remindMe-text'], $data, function ($message) use ($email) {
+                ['emails.user.remindMe-html', 'emails.user.remindMe-text'], $data, function (Message $message) use ($email) {
                 $message->to($email, $email)->subject('Forgot your password?');
             }
             );
@@ -77,7 +78,8 @@ class Registration implements RegistrationInterface
 
         try {
             \Mail::send(
-                ['emails.user.verify-html', 'emails.user.verify-text'], $data, function ($message) use ($email) {
+                ['emails.user.verify-html', 'emails.user.verify-text'], $data, function (Message $message) use ($email) {
+
                 $message->to($email, $email)->subject('Verify your e-mail address.');
             }
             );
diff --git a/server.php b/server.php
index 5f187f3441..dfdf3bcd6b 100644
--- a/server.php
+++ b/server.php
@@ -11,7 +11,7 @@ $requested = $paths['public'].$uri;
 // This file allows us to emulate Apache's "mod_rewrite" functionality from the
 // built-in PHP web server. This provides a convenient way to test a Laravel
 // application without having installed a "real" web server software here.
-if ($uri !== '/' and file_exists($requested))
+if ($uri !== '/' && file_exists($requested))
 {
 	return false;
 }