diff --git a/Changelog b/Changelog
index d1debc0b0..247267fba 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2017-07-30 DariusIII
+	* Chg: Rename bootstrap/bootstrap.php to autoload.php
 	* Chg: Update composer files
 	* Chg: Move Controllers and Middleware folders back to app/Http/ folder
 2017-07-28 DariusIII
diff --git a/bootstrap.php b/bootstrap.php
index 8aacbcced..6005335f5 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -17,6 +17,6 @@
  * @copyright 2016 nZEDb
  */
 
-require_once __DIR__ . '/bootstrap/bootstrap.php';
+require_once __DIR__ . '/bootstrap/autoload.php';
 
 ?>
diff --git a/bootstrap/bootstrap.php b/bootstrap/autoload.php
similarity index 100%
rename from bootstrap/bootstrap.php
rename to bootstrap/autoload.php
diff --git a/phpunit.xml b/phpunit.xml
index f8356750d..d1b369fbf 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="./bootstrap/bootstrap.php"
+         bootstrap="./bootstrap/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
diff --git a/tmux b/tmux
index a23e345a5..1f46ff31a 100755
--- a/tmux
+++ b/tmux
@@ -13,7 +13,7 @@
 |
 */
 
-require __DIR__.'/bootstrap/bootstrap.php';
+require __DIR__.'/bootstrap/autoload.php';
 
 $app = require __DIR__.'/bootstrap/app.php';