diff --git a/build/update_header_comments.php b/build/update_header_comments.php
index 1f6cdaa2..18562f53 100644
--- a/build/update_header_comments.php
+++ b/build/update_header_comments.php
@@ -5,7 +5,9 @@ $file_patterns = [
 	'app/bootstrap.php',
 	'migrations/*.php',
 	'src/**/*.php',
+	'src/*.php',
 	'tests/**/*.php',
+	'tests/*.php'
 ];
 
 if ( ! function_exists('glob_recursive'))
@@ -60,6 +62,7 @@ function get_tokens($source)
 
 function replace_files(array $files, $template)
 {
+	print_r($files);
 	foreach ($files as $file)
 	{
 		$source = file_get_contents($file);
diff --git a/src/AnimeClient.php b/src/AnimeClient.php
index b43531bd..dddffd9b 100644
--- a/src/AnimeClient.php
+++ b/src/AnimeClient.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Hummingbird Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2016  Timothy J. Warren
+ * @copyright   2015 - 2017  Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
diff --git a/src/Controller.php b/src/Controller.php
index 284673e3..63e1194c 100644
--- a/src/Controller.php
+++ b/src/Controller.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Hummingbird Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2016  Timothy J. Warren
+ * @copyright   2015 - 2017  Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index bda57451..5e3eb59e 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -81,11 +81,11 @@ class Anime extends BaseController {
 	{
 		$typeTitleMap = [
 			'all' => 'All',
-			AnimeWatchingStatus::WATCHING => 'Currently Watching',
-			AnimeWatchingStatus::PLAN_TO_WATCH => 'Plan to Watch',
-			AnimeWatchingStatus::ON_HOLD => 'On Hold',
-			AnimeWatchingStatus::DROPPED => 'Dropped',
-			AnimeWatchingStatus::COMPLETED => 'Completed'
+			'watching' => 'Currently Watching',
+			'plan_to_watch' => 'Plan to Watch',
+			'on_hold' => 'On Hold',
+			'dropped' => 'Dropped',
+			'completed' => 'Completed'
 		];
 
 		$modelMap = [
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
index f06a185b..29f88fb9 100644
--- a/src/Dispatcher.php
+++ b/src/Dispatcher.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Hummingbird Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2016  Timothy J. Warren
+ * @copyright   2015 - 2017  Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
diff --git a/src/MenuGenerator.php b/src/MenuGenerator.php
index a292616f..fe09acf5 100644
--- a/src/MenuGenerator.php
+++ b/src/MenuGenerator.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Hummingbird Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2016  Timothy J. Warren
+ * @copyright   2015 - 2017  Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
diff --git a/src/RoutingBase.php b/src/RoutingBase.php
index 79cde788..16673107 100644
--- a/src/RoutingBase.php
+++ b/src/RoutingBase.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Hummingbird Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2016  Timothy J. Warren
+ * @copyright   2015 - 2017  Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
diff --git a/src/UrlGenerator.php b/src/UrlGenerator.php
index 95df8f5c..bb523411 100644
--- a/src/UrlGenerator.php
+++ b/src/UrlGenerator.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Hummingbird Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2016  Timothy J. Warren
+ * @copyright   2015 - 2017  Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
diff --git a/src/Util.php b/src/Util.php
index ac038b45..7cbcd427 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -1,16 +1,16 @@
 <?php declare(strict_types=1);
 /**
- * Hummingbird Anime Client
+ * Hummingbird Anime List Client
  *
- * An API client for Hummingbird to manage anime and manga watch lists
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
  *
  * PHP version 7
  *
  * @package     HummingbirdAnimeClient
  * @author      Timothy J. Warren <tim@timshomepage.net>
- * @copyright   2015 - 2016  Timothy J. Warren
+ * @copyright   2015 - 2017  Timothy J. Warren
  * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
- * @version     3.1
+ * @version     4.0
  * @link        https://github.com/timw4mail/HummingBirdAnimeClient
  */
 
diff --git a/tests/AnimeClientTest.php b/tests/AnimeClientTest.php
index da4b1e68..0122541c 100644
--- a/tests/AnimeClientTest.php
+++ b/tests/AnimeClientTest.php
@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Hummingbird Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     HummingbirdAnimeClient
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2017  Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
 
 namespace Aviat\AnimeClient\Tests;
 
diff --git a/tests/AnimeClientTestCase.php b/tests/AnimeClientTestCase.php
index 3009714a..94b484eb 100644
--- a/tests/AnimeClientTestCase.php
+++ b/tests/AnimeClientTestCase.php
@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Hummingbird Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     HummingbirdAnimeClient
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2017  Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
 
 namespace Aviat\AnimeClient\Tests;
 
diff --git a/tests/ControllerTest.php b/tests/ControllerTest.php
index 37b09abe..7421c6e7 100644
--- a/tests/ControllerTest.php
+++ b/tests/ControllerTest.php
@@ -1,4 +1,18 @@
 <?php declare(strict_types=1);
+/**
+ * Hummingbird Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     HummingbirdAnimeClient
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2017  Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
 
 namespace Aviat\AnimeClient\Tests;
 
diff --git a/tests/DispatcherTest.php b/tests/DispatcherTest.php
index f52f6d1e..9650779c 100644
--- a/tests/DispatcherTest.php
+++ b/tests/DispatcherTest.php
@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Hummingbird Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     HummingbirdAnimeClient
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2017  Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
 
 namespace Aviat\AnimeClient\Tests;
 
diff --git a/tests/MenuGeneratorTest.php b/tests/MenuGeneratorTest.php
index 53ed0636..d412c9c9 100644
--- a/tests/MenuGeneratorTest.php
+++ b/tests/MenuGeneratorTest.php
@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Hummingbird Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     HummingbirdAnimeClient
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2017  Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
 
 namespace Aviat\AnimeClient\Tests;
 
diff --git a/tests/RequirementsTest.php b/tests/RequirementsTest.php
index 28f0ff5c..be1bfd3a 100644
--- a/tests/RequirementsTest.php
+++ b/tests/RequirementsTest.php
@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Hummingbird Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     HummingbirdAnimeClient
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2017  Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
 
 namespace Aviat\AnimeClient\Tests;
 
diff --git a/tests/RoutingBaseTest.php b/tests/RoutingBaseTest.php
index 19f7d7bd..39aab47c 100644
--- a/tests/RoutingBaseTest.php
+++ b/tests/RoutingBaseTest.php
@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Hummingbird Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     HummingbirdAnimeClient
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2017  Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
 
 namespace Aviat\AnimeClient\Tests;
 
diff --git a/tests/TestSessionHandler.php b/tests/TestSessionHandler.php
index 487b01fa..9b7b486e 100644
--- a/tests/TestSessionHandler.php
+++ b/tests/TestSessionHandler.php
@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Hummingbird Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     HummingbirdAnimeClient
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2017  Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
 
 namespace Aviat\AnimeClient\Tests;
 
diff --git a/tests/UrlGeneratorTest.php b/tests/UrlGeneratorTest.php
index 33470985..3ffd06af 100644
--- a/tests/UrlGeneratorTest.php
+++ b/tests/UrlGeneratorTest.php
@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Hummingbird Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     HummingbirdAnimeClient
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2017  Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
 
 namespace Aviat\AnimeClient\Tests;
 
diff --git a/tests/UtilTest.php b/tests/UtilTest.php
index 061dcf73..f67e9b53 100644
--- a/tests/UtilTest.php
+++ b/tests/UtilTest.php
@@ -1,4 +1,18 @@
-<?php
+<?php declare(strict_types=1);
+/**
+ * Hummingbird Anime List Client
+ *
+ * An API client for Kitsu and MyAnimeList to manage anime and manga watch lists
+ *
+ * PHP version 7
+ *
+ * @package     HummingbirdAnimeClient
+ * @author      Timothy J. Warren <tim@timshomepage.net>
+ * @copyright   2015 - 2017  Timothy J. Warren
+ * @license     http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version     4.0
+ * @link        https://github.com/timw4mail/HummingBirdAnimeClient
+ */
 
 namespace Aviat\AnimeClient\Tests;