diff --git a/index.js b/index.js
index 4db86ed..be3e15a 100644
--- a/index.js
+++ b/index.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 exports.Class         = require( __dirname + '/lib/class' );
diff --git a/lib/ClassBuilder.js b/lib/ClassBuilder.js
index f5f2ec1..73f545c 100644
--- a/lib/ClassBuilder.js
+++ b/lib/ClassBuilder.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  *
  * TODO: This module is currently being tested /indirectly/ by the class tests.
  *       This is because of a refactoring. All of this logic used to be part of
diff --git a/lib/FallbackMemberBuilder.js b/lib/FallbackMemberBuilder.js
index cfbe097..3473928 100644
--- a/lib/FallbackMemberBuilder.js
+++ b/lib/FallbackMemberBuilder.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 /**
diff --git a/lib/FallbackVisibilityObjectFactory.js b/lib/FallbackVisibilityObjectFactory.js
index 20c880c..cf232ae 100644
--- a/lib/FallbackVisibilityObjectFactory.js
+++ b/lib/FallbackVisibilityObjectFactory.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 
diff --git a/lib/MemberBuilder.js b/lib/MemberBuilder.js
index 76d6136..62e2318 100644
--- a/lib/MemberBuilder.js
+++ b/lib/MemberBuilder.js
@@ -29,7 +29,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 var util       = require( __dirname + '/util' ),
diff --git a/lib/MemberBuilderValidator.js b/lib/MemberBuilderValidator.js
index f618a28..bee57e4 100644
--- a/lib/MemberBuilderValidator.js
+++ b/lib/MemberBuilderValidator.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 
diff --git a/lib/MethodWrapperFactory.js b/lib/MethodWrapperFactory.js
index 5ed4a18..bae8d8d 100644
--- a/lib/MethodWrapperFactory.js
+++ b/lib/MethodWrapperFactory.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 
diff --git a/lib/MethodWrappers.js b/lib/MethodWrappers.js
index 6b71256..681fff7 100644
--- a/lib/MethodWrappers.js
+++ b/lib/MethodWrappers.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 /**
diff --git a/lib/VisibilityObjectFactory.js b/lib/VisibilityObjectFactory.js
index b07a267..d3c7510 100644
--- a/lib/VisibilityObjectFactory.js
+++ b/lib/VisibilityObjectFactory.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 /**
diff --git a/lib/VisibilityObjectFactoryFactory.js b/lib/VisibilityObjectFactoryFactory.js
index ff56d9f..ddc9f0f 100644
--- a/lib/VisibilityObjectFactoryFactory.js
+++ b/lib/VisibilityObjectFactoryFactory.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 // XXX: Tightly coupled
diff --git a/lib/class.js b/lib/class.js
index 9bfbbe9..a0832e8 100644
--- a/lib/class.js
+++ b/lib/class.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 var util         = require( __dirname + '/util' ),
diff --git a/lib/class_abstract.js b/lib/class_abstract.js
index e7c2107..7a7f9fc 100644
--- a/lib/class_abstract.js
+++ b/lib/class_abstract.js
@@ -23,7 +23,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 var Class = require( __dirname + '/class' );
diff --git a/lib/class_final.js b/lib/class_final.js
index 49b4b8a..7b88ebf 100644
--- a/lib/class_final.js
+++ b/lib/class_final.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 var Class = require( __dirname + '/class' );
diff --git a/lib/interface.js b/lib/interface.js
index 2f074cc..69b74e6 100644
--- a/lib/interface.js
+++ b/lib/interface.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 var util           = require( __dirname + '/util' ),
diff --git a/lib/prop_parser.js b/lib/prop_parser.js
index 2f95c46..7a7a5c8 100644
--- a/lib/prop_parser.js
+++ b/lib/prop_parser.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 /**
diff --git a/lib/util.js b/lib/util.js
index 88f1731..281f269 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 var propParseKeywords = require( __dirname + '/prop_parser' ).parseKeywords;
diff --git a/lib/warn.js b/lib/warn.js
index 8e36c39..4f31825 100644
--- a/lib/warn.js
+++ b/lib/warn.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package core
  */
 
 /**
diff --git a/test/FallbackMemberBuilderTest.js b/test/FallbackMemberBuilderTest.js
index 6435f9b..9c4e57b 100644
--- a/test/FallbackMemberBuilderTest.js
+++ b/test/FallbackMemberBuilderTest.js
@@ -21,7 +21,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 require( './common' ).testCase(
diff --git a/test/FallbackVisibilityObjectFactoryTest.js b/test/FallbackVisibilityObjectFactoryTest.js
index ab3faa5..0f51203 100644
--- a/test/FallbackVisibilityObjectFactoryTest.js
+++ b/test/FallbackVisibilityObjectFactoryTest.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 
diff --git a/test/Interface/ExtendTest.js b/test/Interface/ExtendTest.js
index bad2eda..14b6fee 100644
--- a/test/Interface/ExtendTest.js
+++ b/test/Interface/ExtendTest.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common    = require( 'common' ),
diff --git a/test/Interface/GeneralTest.js b/test/Interface/GeneralTest.js
index ee50cc9..a491e6e 100644
--- a/test/Interface/GeneralTest.js
+++ b/test/Interface/GeneralTest.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 require( 'common' ).testCase(
diff --git a/test/MemberBuilder/GetterSetterTest.js b/test/MemberBuilder/GetterSetterTest.js
index b3df1c2..5ba2edd 100644
--- a/test/MemberBuilder/GetterSetterTest.js
+++ b/test/MemberBuilder/GetterSetterTest.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( 'common' ),
diff --git a/test/MemberBuilder/MethodTest.js b/test/MemberBuilder/MethodTest.js
index 767f754..a6ab9a2 100644
--- a/test/MemberBuilder/MethodTest.js
+++ b/test/MemberBuilder/MethodTest.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var shared = require( __dirname + '/inc-common' );
diff --git a/test/MemberBuilder/PropTest.js b/test/MemberBuilder/PropTest.js
index 7844cc5..e4505da 100644
--- a/test/MemberBuilder/PropTest.js
+++ b/test/MemberBuilder/PropTest.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var shared = require( __dirname + '/inc-common' );
diff --git a/test/MemberBuilder/VisibilityTest.js b/test/MemberBuilder/VisibilityTest.js
index 8632dc5..f3398af 100644
--- a/test/MemberBuilder/VisibilityTest.js
+++ b/test/MemberBuilder/VisibilityTest.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 // get-set-test (supported)
diff --git a/test/MemberBuilder/inc-common.js b/test/MemberBuilder/inc-common.js
index 2a32d0b..538e480 100644
--- a/test/MemberBuilder/inc-common.js
+++ b/test/MemberBuilder/inc-common.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 /**
diff --git a/test/MemberBuilderValidator/GetterSetterTest.js b/test/MemberBuilderValidator/GetterSetterTest.js
index 54fb702..0cd9a15 100644
--- a/test/MemberBuilderValidator/GetterSetterTest.js
+++ b/test/MemberBuilderValidator/GetterSetterTest.js
@@ -22,7 +22,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var shared = require( __dirname + '/inc-common' );
diff --git a/test/MemberBuilderValidator/MethodTest.js b/test/MemberBuilderValidator/MethodTest.js
index 0bada10..e78bd43 100644
--- a/test/MemberBuilderValidator/MethodTest.js
+++ b/test/MemberBuilderValidator/MethodTest.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var shared = require( __dirname + '/inc-common' );
diff --git a/test/MemberBuilderValidator/PropertyTest.js b/test/MemberBuilderValidator/PropertyTest.js
index 2f37825..dd80abe 100644
--- a/test/MemberBuilderValidator/PropertyTest.js
+++ b/test/MemberBuilderValidator/PropertyTest.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var shared = require( __dirname + '/inc-common' );
diff --git a/test/MemberBuilderValidator/inc-common.js b/test/MemberBuilderValidator/inc-common.js
index 9526140..caf4514 100644
--- a/test/MemberBuilderValidator/inc-common.js
+++ b/test/MemberBuilderValidator/inc-common.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 
diff --git a/test/MethodWrapperFactoryTest.js b/test/MethodWrapperFactoryTest.js
index 3a759aa..24a174d 100644
--- a/test/MethodWrapperFactoryTest.js
+++ b/test/MethodWrapperFactoryTest.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 
diff --git a/test/MethodWrappersTest.js b/test/MethodWrappersTest.js
index fd49a56..1b1cb6b 100644
--- a/test/MethodWrappersTest.js
+++ b/test/MethodWrappersTest.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/VisibilityObjectFactoryFactoryTest.js b/test/VisibilityObjectFactoryFactoryTest.js
index 505ddb9..25810f5 100644
--- a/test/VisibilityObjectFactoryFactoryTest.js
+++ b/test/VisibilityObjectFactoryFactoryTest.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 
diff --git a/test/VisibilityObjectFactoryTest.js b/test/VisibilityObjectFactoryTest.js
index 504b747..d4a1da8 100644
--- a/test/VisibilityObjectFactoryTest.js
+++ b/test/VisibilityObjectFactoryTest.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 
diff --git a/test/common.js b/test/common.js
index 299c474..982ba3b 100644
--- a/test/common.js
+++ b/test/common.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 /**
diff --git a/test/inc-testcase.js b/test/inc-testcase.js
index d39e632..4390828 100644
--- a/test/inc-testcase.js
+++ b/test/inc-testcase.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var assert         = require( 'assert' ),
diff --git a/test/perf/common.js b/test/perf/common.js
index 538d7a7..0d8feac 100644
--- a/test/perf/common.js
+++ b/test/perf/common.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 /**
diff --git a/test/perf/perf-class-define-methods-keyword-private.js b/test/perf/perf-class-define-methods-keyword-private.js
index 3c7ecce..b1b6c76 100644
--- a/test/perf/perf-class-define-methods-keyword-private.js
+++ b/test/perf/perf-class-define-methods-keyword-private.js
@@ -20,7 +20,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/perf/perf-class-define-methods-keyword-protected.js b/test/perf/perf-class-define-methods-keyword-protected.js
index 611b8f4..6a89e7a 100644
--- a/test/perf/perf-class-define-methods-keyword-protected.js
+++ b/test/perf/perf-class-define-methods-keyword-protected.js
@@ -20,7 +20,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/perf/perf-class-define-methods-keyword-public.js b/test/perf/perf-class-define-methods-keyword-public.js
index 8820713..705d57a 100644
--- a/test/perf/perf-class-define-methods-keyword-public.js
+++ b/test/perf/perf-class-define-methods-keyword-public.js
@@ -20,7 +20,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/perf/perf-class-define-methods.js b/test/perf/perf-class-define-methods.js
index f51a1c6..7274c8b 100644
--- a/test/perf/perf-class-define-methods.js
+++ b/test/perf/perf-class-define-methods.js
@@ -20,7 +20,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/perf/perf-class-define-named.js b/test/perf/perf-class-define-named.js
index 16f52e9..4f0f1e7 100644
--- a/test/perf/perf-class-define-named.js
+++ b/test/perf/perf-class-define-named.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/perf/perf-class-define-properties-keyword-private.js b/test/perf/perf-class-define-properties-keyword-private.js
index c3ed765..8fe74ff 100644
--- a/test/perf/perf-class-define-properties-keyword-private.js
+++ b/test/perf/perf-class-define-properties-keyword-private.js
@@ -20,7 +20,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/perf/perf-class-define-properties-keyword-protected.js b/test/perf/perf-class-define-properties-keyword-protected.js
index 07f19a4..0a87bc9 100644
--- a/test/perf/perf-class-define-properties-keyword-protected.js
+++ b/test/perf/perf-class-define-properties-keyword-protected.js
@@ -20,7 +20,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/perf/perf-class-define-properties-keyword-public.js b/test/perf/perf-class-define-properties-keyword-public.js
index 569ee5e..f40ff43 100644
--- a/test/perf/perf-class-define-properties-keyword-public.js
+++ b/test/perf/perf-class-define-properties-keyword-public.js
@@ -20,7 +20,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/perf/perf-class-define-properties.js b/test/perf/perf-class-define-properties.js
index 97046d1..a351d71 100644
--- a/test/perf/perf-class-define-properties.js
+++ b/test/perf/perf-class-define-properties.js
@@ -20,7 +20,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/perf/perf-class-define.js b/test/perf/perf-class-define.js
index ad448db..ce11eba 100644
--- a/test/perf/perf-class-define.js
+++ b/test/perf/perf-class-define.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/perf/perf-class-get-property.js b/test/perf/perf-class-get-property.js
index 4e3a0ed..0d81397 100644
--- a/test/perf/perf-class-get-property.js
+++ b/test/perf/perf-class-get-property.js
@@ -20,7 +20,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/perf/perf-class-inst-anon-empty.js b/test/perf/perf-class-inst-anon-empty.js
index d737f95..360c3b7 100644
--- a/test/perf/perf-class-inst-anon-empty.js
+++ b/test/perf/perf-class-inst-anon-empty.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/perf/perf-class-inst-named-empty.js b/test/perf/perf-class-inst-named-empty.js
index 1149909..7906637 100644
--- a/test/perf/perf-class-inst-named-empty.js
+++ b/test/perf/perf-class-inst-named-empty.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/perf/perf-class-invoke-method.js b/test/perf/perf-class-invoke-method.js
index 2a97355..62315ca 100644
--- a/test/perf/perf-class-invoke-method.js
+++ b/test/perf/perf-class-invoke-method.js
@@ -36,7 +36,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/perf/perf-class-require.js b/test/perf/perf-class-require.js
index c5bd893..a145152 100644
--- a/test/perf/perf-class-require.js
+++ b/test/perf/perf-class-require.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/perf/perf-class-set-property.js b/test/perf/perf-class-set-property.js
index 0221d5a..ac388e1 100644
--- a/test/perf/perf-class-set-property.js
+++ b/test/perf/perf-class-set-property.js
@@ -20,7 +20,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package performance
  */
 
 
diff --git a/test/runner.js b/test/runner.js
index 5b21629..4743a7e 100644
--- a/test/runner.js
+++ b/test/runner.js
@@ -22,7 +22,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( 'common' );
diff --git a/test/test-class-abstract.js b/test/test-class-abstract.js
index ae63bfb..9ba4085 100644
--- a/test/test-class-abstract.js
+++ b/test/test-class-abstract.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-class-constructor.js b/test/test-class-constructor.js
index 5544587..e036dab 100644
--- a/test/test-class-constructor.js
+++ b/test/test-class-constructor.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-class-extend.js b/test/test-class-extend.js
index d67d3e4..99c4246 100644
--- a/test/test-class-extend.js
+++ b/test/test-class-extend.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-class-gettersetter.js b/test/test-class-gettersetter.js
index 720efa3..a3d1d57 100644
--- a/test/test-class-gettersetter.js
+++ b/test/test-class-gettersetter.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-class-implement.js b/test/test-class-implement.js
index feb5d7b..c90d81f 100644
--- a/test/test-class-implement.js
+++ b/test/test-class-implement.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common    = require( './common' ),
diff --git a/test/test-class-name.js b/test/test-class-name.js
index 1f4d07f..57bfd24 100644
--- a/test/test-class-name.js
+++ b/test/test-class-name.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-class-parent.js b/test/test-class-parent.js
index ea25903..9b3d156 100644
--- a/test/test-class-parent.js
+++ b/test/test-class-parent.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-class-visibility.js b/test/test-class-visibility.js
index e254377..8dd3fe4 100644
--- a/test/test-class-visibility.js
+++ b/test/test-class-visibility.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common    = require( './common' ),
diff --git a/test/test-class.js b/test/test-class.js
index b8a4a07..982a4d8 100644
--- a/test/test-class.js
+++ b/test/test-class.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-class_builder-const.js b/test/test-class_builder-const.js
index 9c50be0..bd4cfd0 100644
--- a/test/test-class_builder-const.js
+++ b/test/test-class_builder-const.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common  = require( './common' ),
diff --git a/test/test-class_builder-final.js b/test/test-class_builder-final.js
index 47736ab..2e8c91e 100644
--- a/test/test-class_builder-final.js
+++ b/test/test-class_builder-final.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common  = require( './common' ),
diff --git a/test/test-class_builder-member-restrictions.js b/test/test-class_builder-member-restrictions.js
index ea09523..54fb005 100644
--- a/test/test-class_builder-member-restrictions.js
+++ b/test/test-class_builder-member-restrictions.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common  = require( './common' ),
diff --git a/test/test-class_builder-static.js b/test/test-class_builder-static.js
index 639dba2..c6b5a2e 100644
--- a/test/test-class_builder-static.js
+++ b/test/test-class_builder-static.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common   = require( './common' ),
diff --git a/test/test-class_builder-visibility.js b/test/test-class_builder-visibility.js
index 5634578..7fd6230 100644
--- a/test/test-class_builder-visibility.js
+++ b/test/test-class_builder-visibility.js
@@ -21,7 +21,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common  = require( './common' ),
diff --git a/test/test-combine-pre-es5.js b/test/test-combine-pre-es5.js
index 1fd021c..cc52a56 100644
--- a/test/test-combine-pre-es5.js
+++ b/test/test-combine-pre-es5.js
@@ -24,7 +24,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common  = require( './common' ),
diff --git a/test/test-combine.js b/test/test-combine.js
index da0dad5..e07cd2e 100644
--- a/test/test-combine.js
+++ b/test/test-combine.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common  = require( './common' ),
diff --git a/test/test-index.js b/test/test-index.js
index ff551bb..5a0299b 100644
--- a/test/test-index.js
+++ b/test/test-index.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-interface-name.js b/test/test-interface-name.js
index c78a08b..ba1bd09 100644
--- a/test/test-interface-name.js
+++ b/test/test-interface-name.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common     = require( './common' ),
diff --git a/test/test-prop_parser-parse-keywords.js b/test/test-prop_parser-parse-keywords.js
index f4ada64..77f2f1d 100644
--- a/test/test-prop_parser-parse-keywords.js
+++ b/test/test-prop_parser-parse-keywords.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-util-abstract.js b/test/test-util-abstract.js
index f8abfec..9ecfdea 100644
--- a/test/test-util-abstract.js
+++ b/test/test-util-abstract.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-util-clone.js b/test/test-util-clone.js
index cf9cdb2..433660a 100644
--- a/test/test-util-clone.js
+++ b/test/test-util-clone.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-util-copy.js b/test/test-util-copy.js
index 3394558..405d04a 100644
--- a/test/test-util-copy.js
+++ b/test/test-util-copy.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-util-define-secure-prop.js b/test/test-util-define-secure-prop.js
index bf0665e..cdc6f86 100644
--- a/test/test-util-define-secure-prop.js
+++ b/test/test-util-define-secure-prop.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-util-get-property-descriptor.js b/test/test-util-get-property-descriptor.js
index caf3051..49ae44b 100644
--- a/test/test-util-get-property-descriptor.js
+++ b/test/test-util-get-property-descriptor.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-util-prop-parse-keywords.js b/test/test-util-prop-parse-keywords.js
index a0a1d9b..45ff875 100644
--- a/test/test-util-prop-parse-keywords.js
+++ b/test/test-util-prop-parse-keywords.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-util-prop-parse.js b/test/test-util-prop-parse.js
index a477e10..a3051e0 100644
--- a/test/test-util-prop-parse.js
+++ b/test/test-util-prop-parse.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common = require( './common' ),
diff --git a/test/test-warn-exception.js b/test/test-warn-exception.js
index 0b59b61..793a975 100644
--- a/test/test-warn-exception.js
+++ b/test/test-warn-exception.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common  = require( './common' ),
diff --git a/test/test-warn-handlers.js b/test/test-warn-handlers.js
index 4c49199..4d7e449 100644
--- a/test/test-warn-handlers.js
+++ b/test/test-warn-handlers.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common  = require( './common' ),
diff --git a/test/test-warn-impl.js b/test/test-warn-impl.js
index 88a8396..812b9a2 100644
--- a/test/test-warn-impl.js
+++ b/test/test-warn-impl.js
@@ -19,7 +19,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package test
  */
 
 var common  = require( './common' ),
diff --git a/tools/combine-order.js b/tools/combine-order.js
index 0f2afc6..7913455 100644
--- a/tools/combine-order.js
+++ b/tools/combine-order.js
@@ -25,7 +25,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @author  Mike Gerwitz
- * @package tools
  */