diff --git a/js/Closure.js b/js/Closure.js
index a06daad..15770c4 100644
--- a/js/Closure.js
+++ b/js/Closure.js
@@ -1,5 +1,5 @@
 /* 
- * @author: ucla-cs
+ * @author: Jeff Thompson
  * See COPYING for copyright and distribution information.
  * Provide the callback closure for the async communication methods in the NDN class.
  * This is a port of Closure.py from PyCCN, written by: 
diff --git a/js/ContentObject.js b/js/ContentObject.js
index 62aa9fc..9299d84 100644
--- a/js/ContentObject.js
+++ b/js/ContentObject.js
@@ -1,5 +1,5 @@
 /*
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  * This class represents ContentObject Objects
  */
diff --git a/js/FaceInstance.js b/js/FaceInstance.js
index f5fdd08..dfc44a6 100644
--- a/js/FaceInstance.js
+++ b/js/FaceInstance.js
@@ -1,5 +1,5 @@
 /*
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  * This class represents Face Instances
  */
diff --git a/js/ForwardingEntry.js b/js/ForwardingEntry.js
index 467a0ed..a095516 100644
--- a/js/ForwardingEntry.js
+++ b/js/ForwardingEntry.js
@@ -1,5 +1,5 @@
 /*
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  * This class represents Forwarding Entries
  */
diff --git a/js/Interest.js b/js/Interest.js
index baa7f33..7e6ddc4 100644
--- a/js/Interest.js
+++ b/js/Interest.js
@@ -1,5 +1,5 @@
  /*
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  * This class represents Interest Objects
  */
diff --git a/js/Key.js b/js/Key.js
index f5b56e0..eca05d9 100644
--- a/js/Key.js
+++ b/js/Key.js
@@ -1,5 +1,5 @@
 /*
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  * This class represents Key Objects
  */
diff --git a/js/Name.js b/js/Name.js
index 7eec77a..7c4e05a 100644
--- a/js/Name.js
+++ b/js/Name.js
@@ -1,5 +1,5 @@
 /*
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  * This class represents a Name as an array of components where each is a byte array.
  */
diff --git a/js/PublisherID.js b/js/PublisherID.js
index 29a3add..31dd8a1 100644
--- a/js/PublisherID.js
+++ b/js/PublisherID.js
@@ -1,5 +1,5 @@
 /*
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  * This class represents Publisher and PublisherType Objects
  */
diff --git a/js/PublisherPublicKeyDigest.js b/js/PublisherPublicKeyDigest.js
index b85e26b..9618f4f 100644
--- a/js/PublisherPublicKeyDigest.js
+++ b/js/PublisherPublicKeyDigest.js
@@ -1,5 +1,5 @@
 /*
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  * This class represents PublisherPublicKeyDigest Objects
  */
diff --git a/js/ccnxProtocol/install.rdf b/js/ccnxProtocol/install.rdf
index a4edaf7..8d390e6 100644
--- a/js/ccnxProtocol/install.rdf
+++ b/js/ccnxProtocol/install.rdf
@@ -5,7 +5,7 @@
     <em:type>2</em:type>
     <em:name>ccnx Protocol</em:name>
     <em:version>0.1</em:version>
-    <em:creator>ucla-cs</em:creator>
+    <em:creator>Jeff Thompson</em:creator>
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- Firefox -->
diff --git a/js/ccnxProtocol/modules/ContentChannel.jsm b/js/ccnxProtocol/modules/ContentChannel.jsm
index 37d9a2d..fc7f500 100644
--- a/js/ccnxProtocol/modules/ContentChannel.jsm
+++ b/js/ccnxProtocol/modules/ContentChannel.jsm
@@ -1,5 +1,5 @@
 /*
- * @author: ucla-cs
+ * @author: Jeff Thompson
  * See COPYING for copyright and distribution information.
  */
 
diff --git a/js/ccnxProtocol/modules/ndn-js-header.txt b/js/ccnxProtocol/modules/ndn-js-header.txt
index 0660198..c4703d4 100644
--- a/js/ccnxProtocol/modules/ndn-js-header.txt
+++ b/js/ccnxProtocol/modules/ndn-js-header.txt
@@ -1,7 +1,7 @@
 /* This file is created by running make-ndn-js.jsm.sh in this directory.
  * It concatenates ndn-js-header.txt with all the ndn-js source files to
  *   make ndn-js.jsm .
- * author: ucla-cs
+ * author: Jeff Thompson
  * See COPYING for copyright and distribution information.
  */
 
diff --git a/js/encoding/BinaryXMLDecoder.js b/js/encoding/BinaryXMLDecoder.js
index 53343f4..718f898 100644
--- a/js/encoding/BinaryXMLDecoder.js
+++ b/js/encoding/BinaryXMLDecoder.js
@@ -1,7 +1,7 @@
 /*
  * This class is used to decode ccnb binary elements (blob, type/value pairs).
  * 
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  */
 
diff --git a/js/encoding/BinaryXMLEncoder.js b/js/encoding/BinaryXMLEncoder.js
index 5460427..7883622 100644
--- a/js/encoding/BinaryXMLEncoder.js
+++ b/js/encoding/BinaryXMLEncoder.js
@@ -1,7 +1,7 @@
 /*
  * This class is used to encode ccnb binary elements (blob, type/value pairs).
  * 
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  */
 
diff --git a/js/encoding/BinaryXMLStructureDecoder.js b/js/encoding/BinaryXMLStructureDecoder.js
index 4ad3de9..04a3b56 100644
--- a/js/encoding/BinaryXMLStructureDecoder.js
+++ b/js/encoding/BinaryXMLStructureDecoder.js
@@ -2,7 +2,7 @@
  * This class uses BinaryXMLDecoder to follow the structure of a ccnb binary element to 
  * determine its end.
  * 
- * @author: ucla-cs
+ * @author: Jeff Thompson
  * See COPYING for copyright and distribution information.
  */
 
diff --git a/js/encoding/DataUtils.js b/js/encoding/DataUtils.js
index c725209..54f79de 100644
--- a/js/encoding/DataUtils.js
+++ b/js/encoding/DataUtils.js
@@ -1,6 +1,6 @@
 /*
  * This class contains utilities to help parse the data
- * author: ucla-cs
+ * author: Meki Cheraoui, Jeff Thompson
  * See COPYING for copyright and distribution information.
  */
  
diff --git a/js/encoding/EncodingUtils.js b/js/encoding/EncodingUtils.js
index 07180d9..3f46204 100644
--- a/js/encoding/EncodingUtils.js
+++ b/js/encoding/EncodingUtils.js
@@ -1,6 +1,6 @@
 /*
  * This file contains utilities to help encode and decode NDN objects.
- * author: ucla-cs
+ * author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  */
 
diff --git a/js/encoding/MimeTypes.js b/js/encoding/MimeTypes.js
index b5459ed..9689355 100644
--- a/js/encoding/MimeTypes.js
+++ b/js/encoding/MimeTypes.js
@@ -1,3 +1,9 @@
+/*
+ * This class defines MOME types based on the filename extension.
+ * author: Jeff Thompson
+ * See COPYING for copyright and distribution information.
+ */
+ 
 var MimeTypes = {
   /*
    * Based on filename, return an object with properties contentType and charset.
diff --git a/js/encoding/TextXMLCodec.js b/js/encoding/TextXMLCodec.js
index b8d5662..97e5f15 100644
--- a/js/encoding/TextXMLCodec.js
+++ b/js/encoding/TextXMLCodec.js
@@ -1,6 +1,6 @@
 //TODO INCOMPLETE
 /*
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  * 
  * Encodes CCN object into xml tags
diff --git a/js/encoding/TextXMLDecoder.js b/js/encoding/TextXMLDecoder.js
index 54bf2d7..784f217 100644
--- a/js/encoding/TextXMLDecoder.js
+++ b/js/encoding/TextXMLDecoder.js
@@ -1,7 +1,7 @@
 //TODO INCOMPLETE
 
 /*
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  * 
  * Decodes CCN object into xml
diff --git a/js/encoding/TextXMLEncoder.js b/js/encoding/TextXMLEncoder.js
index b22aa0c..1b9f5a9 100644
--- a/js/encoding/TextXMLEncoder.js
+++ b/js/encoding/TextXMLEncoder.js
@@ -1,6 +1,6 @@
 //TODO INCOMPLETE
 /*
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  * 
  * Encodes CCN object into xml
diff --git a/js/security/KeyManager.js b/js/security/KeyManager.js
index cb051eb..8b4e2dc 100644
--- a/js/security/KeyManager.js
+++ b/js/security/KeyManager.js
@@ -1,5 +1,5 @@
 /*
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  */
 
diff --git a/js/securityLib/rsasign-1.2.js b/js/securityLib/rsasign-1.2.js
index 66cef59..1b4047a 100644
--- a/js/securityLib/rsasign-1.2.js
+++ b/js/securityLib/rsasign-1.2.js
@@ -87,7 +87,7 @@
 }
 
 
-//@author: ucla-cs
+//@author: Meki Cheraoui
 function _rsasign_getHexPaddedDigestInfoForStringHEX(s, keySize, hashAlg) {
   var pmStrLen = keySize / 4;
   var hashFunc = _RSASIGN_HASHHEXFUNC[hashAlg];
diff --git a/js/util/CCNProtocolDTags.js b/js/util/CCNProtocolDTags.js
index 6dbae96..73af55f 100644
--- a/js/util/CCNProtocolDTags.js
+++ b/js/util/CCNProtocolDTags.js
@@ -1,5 +1,5 @@
 /*
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  * This class contains all CCNx tags
  */
diff --git a/js/util/CCNTime.js b/js/util/CCNTime.js
index 91debd4..3e7be6f 100644
--- a/js/util/CCNTime.js
+++ b/js/util/CCNTime.js
@@ -1,5 +1,5 @@
 /*
- * @author: ucla-cs
+ * @author: Meki Cheraoui
  * See COPYING for copyright and distribution information.
  * This class represents CCNTime Objects
  */