diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 05a1e635..3d29f140 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -11,13 +11,13 @@ class Kernel extends HttpKernel {
 	 * @var array
 	 */
 	protected $middleware = [
-		'App\Http\Middleware\MaintenanceMiddleware',
-		'Illuminate\Cookie\Middleware\Guard',
-		'Illuminate\Cookie\Middleware\Queue',
-		'Illuminate\Session\Middleware\Reader',
-		'Illuminate\Session\Middleware\Writer',
-		'Illuminate\View\Middleware\ErrorBinder',
-		'App\Http\Middleware\CsrfMiddleware',
+		'App\Http\Middleware\UnderMaintenance',
+		'Illuminate\Cookie\Middleware\EncryptCookies',
+		'Illuminate\Cookie\Middleware\AddQueuedCookiesToRequest',
+		'Illuminate\Session\Middleware\ReadSession',
+		'Illuminate\Session\Middleware\WriteSession',
+		'Illuminate\View\Middleware\ShareErrorsFromSession',
+		'App\Http\Middleware\ValidateCsrfToken',
 	];
 
 	/**
diff --git a/app/Http/Middleware/GuestMiddleware.php b/app/Http/Middleware/IsGuest.php
similarity index 93%
rename from app/Http/Middleware/GuestMiddleware.php
rename to app/Http/Middleware/IsGuest.php
index 1197f005..5abfc5e0 100644
--- a/app/Http/Middleware/GuestMiddleware.php
+++ b/app/Http/Middleware/IsGuest.php
@@ -5,7 +5,7 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Contracts\Routing\Middleware;
 
-class GuestMiddleware implements Middleware {
+class IsGuest implements Middleware {
 
 	/**
 	 * The Guard implementation.
diff --git a/app/Http/Middleware/AuthMiddleware.php b/app/Http/Middleware/LoggedIn.php
similarity index 95%
rename from app/Http/Middleware/AuthMiddleware.php
rename to app/Http/Middleware/LoggedIn.php
index 6e9c3e6b..9d49ae8c 100644
--- a/app/Http/Middleware/AuthMiddleware.php
+++ b/app/Http/Middleware/LoggedIn.php
@@ -5,7 +5,7 @@
 use Illuminate\Contracts\Routing\Middleware;
 use Illuminate\Contracts\Routing\ResponseFactory;
 
-class AuthMiddleware implements Middleware {
+class LoggedIn implements Middleware {
 
 	/**
 	 * The Guard implementation.
diff --git a/app/Http/Middleware/BasicAuthMiddleware.php b/app/Http/Middleware/LoggedInWithBasicAuth.php
similarity index 92%
rename from app/Http/Middleware/BasicAuthMiddleware.php
rename to app/Http/Middleware/LoggedInWithBasicAuth.php
index 37776b48..2f4f84a4 100644
--- a/app/Http/Middleware/BasicAuthMiddleware.php
+++ b/app/Http/Middleware/LoggedInWithBasicAuth.php
@@ -4,7 +4,7 @@
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\Routing\Middleware;
 
-class BasicAuthMiddleware implements Middleware {
+class LoggedInWithBasicAuth implements Middleware {
 
 	/**
 	 * The Guard implementation.
diff --git a/app/Http/Middleware/MaintenanceMiddleware.php b/app/Http/Middleware/UnderMaintenance.php
similarity index 93%
rename from app/Http/Middleware/MaintenanceMiddleware.php
rename to app/Http/Middleware/UnderMaintenance.php
index 7a95fe4d..16d8496d 100644
--- a/app/Http/Middleware/MaintenanceMiddleware.php
+++ b/app/Http/Middleware/UnderMaintenance.php
@@ -5,7 +5,7 @@
 use Illuminate\Contracts\Routing\Middleware;
 use Illuminate\Contracts\Foundation\Application;
 
-class MaintenanceMiddleware implements Middleware {
+class UnderMaintenance implements Middleware {
 
 	/**
 	 * The application implementation.
diff --git a/app/Http/Middleware/CsrfMiddleware.php b/app/Http/Middleware/ValidateCsrfToken.php
similarity index 93%
rename from app/Http/Middleware/CsrfMiddleware.php
rename to app/Http/Middleware/ValidateCsrfToken.php
index 3f019d3a..2f1f983d 100644
--- a/app/Http/Middleware/CsrfMiddleware.php
+++ b/app/Http/Middleware/ValidateCsrfToken.php
@@ -4,7 +4,7 @@
 use Illuminate\Contracts\Routing\Middleware;
 use Illuminate\Session\TokenMismatchException;
 
-class CsrfMiddleware implements Middleware {
+class ValidateCsrfToken implements Middleware {
 
 	/**
 	 * Handle an incoming request.
@@ -12,7 +12,7 @@ class CsrfMiddleware implements Middleware {
 	 * @param  \Illuminate\Http\Request  $request
 	 * @param  \Closure  $next
 	 * @return mixed
-	 * 
+	 *
 	 * @throws TokenMismatchException
 	 */
 	public function handle($request, Closure $next)
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index e1fa99c0..fbded060 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -22,10 +22,10 @@ class RouteServiceProvider extends ServiceProvider {
 	 * @var array
 	 */
 	protected $middleware = [
-		'auth' => 'App\Http\Middleware\AuthMiddleware',
-		'auth.basic' => 'App\Http\Middleware\BasicAuthMiddleware',
-		'csrf' => 'App\Http\Middleware\CsrfMiddleware',
-		'guest' => 'App\Http\Middleware\GuestMiddleware',
+		'auth' => 'App\Http\Middleware\LoggedIn',
+		'auth.basic' => 'App\Http\Middleware\LoggedInWithBasicAuth',
+		'csrf' => 'App\Http\Middleware\VerifyCsrfToken',
+		'guest' => 'App\Http\Middleware\IsGuest',
 	];
 
 	/**