Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml
===================================================================
diff -u -r14d82446e40bfe1dfa32a2710cd5453da3261a37 -r56322171d54c1a5b5711ba623f965db29d63dddd
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	(.../ExtUserUseridMap.hbm.xml)	(revision 14d82446e40bfe1dfa32a2710cd5453da3261a37)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtUserUseridMap.hbm.xml	(.../ExtUserUseridMap.hbm.xml)	(revision 56322171d54c1a5b5711ba623f965db29d63dddd)
@@ -40,14 +40,14 @@
     <property
         name="foreignUsername"
         type="java.lang.String"
-        column="foreign_username"
+        column="external_username"
         not-null="true"
         length="250"
     >
         <meta attribute="use-in-tostring">true</meta>
         <meta attribute="field-description">
            @hibernate.property
-            column="foreign_username"
+            column="external_username"
             length="250"
             not-null="true"
         </meta>    
Index: lams_common/db/sql/create_integration_tables.sql
===================================================================
diff -u -r5732eae12edb6d5513ae073b1a0f1563deb175ab -r56322171d54c1a5b5711ba623f965db29d63dddd
--- lams_common/db/sql/create_integration_tables.sql	(.../create_integration_tables.sql)	(revision 5732eae12edb6d5513ae073b1a0f1563deb175ab)
+++ lams_common/db/sql/create_integration_tables.sql	(.../create_integration_tables.sql)	(revision 56322171d54c1a5b5711ba623f965db29d63dddd)
@@ -43,7 +43,7 @@
 DROP TABLE IF EXISTS `lams_ext_user_userid_map`;
 CREATE TABLE `lams_ext_user_userid_map` (
   `sid` int(11) NOT NULL auto_increment,
-  `foreign_username` varchar(250) NOT NULL,
+  `external_username` varchar(250) NOT NULL,
   `user_id` bigint(20) NOT NULL,
   `ext_server_org_map_id` int(11) NOT NULL,
   PRIMARY KEY  (`sid`),
Index: lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java
===================================================================
diff -u -rf1b668739b744f48d8f603f951ab0bd2ba310a0b -r56322171d54c1a5b5711ba623f965db29d63dddd
--- lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java	(.../ExtUserUseridMap.java)	(revision f1b668739b744f48d8f603f951ab0bd2ba310a0b)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java	(.../ExtUserUseridMap.java)	(revision 56322171d54c1a5b5711ba623f965db29d63dddd)
@@ -18,7 +18,7 @@
     private Integer sid;
 
     /** persistent field */
-    private String foreignUsername;
+    private String extUsername;
 
     /** persistent field */
     private User user;
@@ -27,8 +27,8 @@
     private ExtServerOrgMap extServerOrgMap;
 
     /** full constructor */
-    public ExtUserUseridMap(String foreignUsername, User user, org.lamsfoundation.lams.integration.ExtServerOrgMap extServerOrgMap) {
-        this.foreignUsername = foreignUsername;
+    public ExtUserUseridMap(String extUsername, User user, ExtServerOrgMap extServerOrgMap) {
+        this.extUsername = extUsername;
         this.user = user;
         this.extServerOrgMap = extServerOrgMap;
     }
@@ -54,17 +54,17 @@
 
     /** 
      *            @hibernate.property
-     *             column="foreign_username"
+     *             column="external_username"
      *             length="250"
      *             not-null="true"
      *         
      */
-    public String getForeignUsername() {
-        return this.foreignUsername;
+    public String getExtUsername() {
+        return this.extUsername;
     }
 
-    public void setForeignUsername(String foreignUsername) {
-        this.foreignUsername = foreignUsername;
+    public void setExtUsername(String extUsername) {
+        this.extUsername = extUsername;
     }
 
     /** 
@@ -87,18 +87,18 @@
      *            @hibernate.column name="ext_server_org_map_id"         
      *         
      */
-    public org.lamsfoundation.lams.integration.ExtServerOrgMap getExtServerOrgMap() {
+    public ExtServerOrgMap getExtServerOrgMap() {
         return this.extServerOrgMap;
     }
 
-    public void setExtServerOrgMap(org.lamsfoundation.lams.integration.ExtServerOrgMap extServerOrgMap) {
+    public void setExtServerOrgMap(ExtServerOrgMap extServerOrgMap) {
         this.extServerOrgMap = extServerOrgMap;
     }
 
     public String toString() {
         return new ToStringBuilder(this)
             .append("sid", getSid())
-            .append("foreignUsername", getForeignUsername())
+            .append("extUsername", getExtUsername())
             .toString();
     }