Index: lams_common/src/java/org/lamsfoundation/lams/applicationResources.properties
===================================================================
diff -u -r19c9010eff6be2e29657beed94349a978088650f -ra02cf86ad3b3bd9d16543ecd88628df98f87ac69
--- lams_common/src/java/org/lamsfoundation/lams/applicationResources.properties	(.../applicationResources.properties)	(revision 19c9010eff6be2e29657beed94349a978088650f)
+++ lams_common/src/java/org/lamsfoundation/lams/applicationResources.properties	(.../applicationResources.properties)	(revision a02cf86ad3b3bd9d16543ecd88628df98f87ac69)
@@ -1,4 +1,4 @@
-# Resources for parameter 'com.lamsinternational.lams.applicationResources'
+# Resources for parameter 'org.lamsfoundation.lams.applicationResources'
 
 #=========================labels===========================#
 
Index: lams_common/src/java/org/lamsfoundation/lams/web/util/TokenProcessor.java
===================================================================
diff -u -r200c979909bee575a20eb26e6e0bc4e0adc92df9 -ra02cf86ad3b3bd9d16543ecd88628df98f87ac69
--- lams_common/src/java/org/lamsfoundation/lams/web/util/TokenProcessor.java	(.../TokenProcessor.java)	(revision 200c979909bee575a20eb26e6e0bc4e0adc92df9)
+++ lams_common/src/java/org/lamsfoundation/lams/web/util/TokenProcessor.java	(.../TokenProcessor.java)	(revision a02cf86ad3b3bd9d16543ecd88628df98f87ac69)
@@ -23,15 +23,15 @@
 	/**
 	 * The session token key
 	 */
-	public static String TRANSACTION_TOKEN_KEY = "org.lamsinternational.lams.action.TOKEN";
+	public static String TRANSACTION_TOKEN_KEY = "org.lamsfoundation.lams.action.TOKEN";
 	/**
 	 * The request token key
 	 */
 	public static String TOKEN_KEY = "lams_token";
 	/**
 	 * The session forwards key
 	 */
-	public static String TRANSACTION_FORWARDS = "org.lamsinternational.lams.action.FORWARD";
+	public static String TRANSACTION_FORWARDS = "org.lamsfoundation.lams.action.FORWARD";
 
     /**
      * The timestamp used most recently to generate a token value.
Index: lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java
===================================================================
diff -u -rceebf32d92002b7509364edecf1da2405913e8e7 -ra02cf86ad3b3bd9d16543ecd88628df98f87ac69
--- lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision ceebf32d92002b7509364edecf1da2405913e8e7)
+++ lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java	(.../LessonDataAccessTestCase.java)	(revision a02cf86ad3b3bd9d16543ecd88628df98f87ac69)
@@ -235,7 +235,7 @@
     /**
      * Helper method to validate the created lesson class. This validation
      * method can be reused by sub-classes.
-     * @param lessonClass TODO
+     * @param lessonClass 
      */
     protected void assertLessonClass(LessonClass lessonClass)
     {
@@ -247,7 +247,7 @@
     /**
      * Helper method to validate the created lesson. This validation
      * method can be reused by sub-classes.
-     * @param lesson TODO
+     * @param lesson 
      */
     protected void assertLesson(Lesson lesson)
     {