Merge lp:~nwilliams/akiban-server/cleanup-table-usertable into lp:~akiban-technologies/akiban-server/trunk

[Nathan Williams]

Collapse Table and UserTable and rename most referencing classes, methods, and variables.

Very large diff but 99% IDE generated. Certainly not required, but there isn't much outstanding and the sooner we do the big cleanups the better.

While doing that, remove engine and migration usage from it. Minor cascade to DDLGenerator based tests.

[Thomas Jones-Low (tjoneslo)]

It looks like you only managed to touch about 1/3 of the files in the system.

This looks good, let see what the build system does with it.

review: Approve

[Thomas Jones-Low (tjoneslo)]

There were 8 failures during build/test:

* job data-compat-and-upgrade-test failed at build number 1001: http://sneezy.softstart.com:8080/job/data-compat-and-upgrade-test/1001/

* job insert-regression-test failed at build number 3796: http://sneezy.softstart.com:8080/job/insert-regression-test/3796/

* job sqlselect-regression-test failed at build number 1886: http://sneezy.softstart.com:8080/job/sqlselect-regression-test/1886/

* job recovery-test failed at build number 3526: http://sneezy.softstart.com:8080/job/recovery-test/3526/

* view must-pass failed: data-compat-and-upgrade-test is red

* view must-pass failed: insert-regression-test is red

* view must-pass failed: sqlselect-regression-test is red

* view must-pass failed: recovery-test is red

review: Needs Fixing

[Thomas Jones-Low (tjoneslo)]

This fails currently because the akiban-server-mysqladapter plugin also needs to be udpated, but is currently locked in a private github repository. The failing tests all rely on doing some setup through MySQL (schema creation, data loading, something). I'll disable/remove these tests in the morning and try this again.

These test will need to be fixed/rewritten/discarded.

[Nathan Williams (nwilliams)]

Thanks for monitoring this Thomas.

Don't worry about disabling tests for now. This was 30m of mindless work
and can wait until that repo is sorted out.

Unmerged revisions

2673. By Nathan Williams on 2013-05-28

Update DDLGenerator based tests

2672. By Nathan Williams on 2013-05-28

Remove spurious casts

2671. By Nathan Williams on 2013-05-28

More variable renaming

2670. By Nathan Williams on 2013-05-28

Simple parameter renames

2669. By Nathan Williams on 2013-05-28

Comment cleanup

2668. By Nathan Williams on 2013-05-28

Rename various classes, more method names.

2667. By Nathan Williams on 2013-05-28

Rename various getUserTable(s) methods

2666. By Nathan Williams on 2013-05-28

Move Table methods into UserTable, remove Table, rename UserTable to Table.

=== modified file 'src/main/java/com/akiban/ais/AISCloner.java'
--- src/main/java/com/akiban/ais/AISCloner.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/AISCloner.java	2013-05-28 23:28:27 +0000
@@ -20,7 +20,7 @@
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.Schema;
 import com.akiban.ais.model.TableName;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.ais.protobuf.AISProtobuf;
 import com.akiban.ais.protobuf.ProtobufReader;
 import com.akiban.ais.protobuf.ProtobufWriter;
@@ -44,8 +44,8 @@
         // Preserve the memory table factories for any I_S tables
         Schema schema = destAIS.getSchema(TableName.INFORMATION_SCHEMA);
         if(schema != null) {
-            for(UserTable newTable : schema.getUserTables().values()) {
-                UserTable oldTable = srcAIS.getUserTable(newTable.getName());
+            for(Table newTable : schema.getTables().values()) {
+                Table oldTable = srcAIS.getTable(newTable.getName());
                 if(oldTable != null) {
                     newTable.setMemoryTableFactory(oldTable.getMemoryTableFactory());
                 }

=== modified file 'src/main/java/com/akiban/ais/model/AISBuilder.java'
--- src/main/java/com/akiban/ais/model/AISBuilder.java	2013-04-28 02:44:03 +0000
+++ src/main/java/com/akiban/ais/model/AISBuilder.java	2013-05-28 23:28:27 +0000
@@ -33,7 +33,7 @@
 import com.akiban.ais.model.Join.SourceType;
 
 // AISBuilder can be used to create an AIS. The API is designed to sify the creation of an AIS during a scan
-// of a dump. The user need not search the AIS and hold on to AIS objects (UserTable, Column, etc.). Instead,
+// of a dump. The user need not search the AIS and hold on to AIS objects (Table, Column, etc.). Instead,
 // only names from the dump need be supplied. 
 
 public class AISBuilder {
@@ -83,17 +83,20 @@
         return identityGenerator;
     }
     
-    public UserTable userTable(String schemaName, String tableName) {
-        LOG.trace("userTable: " + schemaName + "." + tableName);
-        return UserTable.create(ais, schemaName, tableName, nameGenerator.generateTableID(new TableName(schemaName, tableName)));
+    public Table table(String schemaName, String tableName) {
+        LOG.trace("table: " + schemaName + "." + tableName);
+        return Table.create(ais,
+                            schemaName,
+                            tableName,
+                            nameGenerator.generateTableID(new TableName(schemaName, tableName)));
     }
 
-    public UserTable userTableInitialAutoIncrement(String schemaName,
-            String tableName, Long initialAutoIncrementValue) {
-        LOG.trace("userTableInitialAutoIncrement: " + schemaName + "."
+    public Table tableInitialAutoIncrement(String schemaName,
+                                           String tableName, Long initialAutoIncrementValue) {
+        LOG.trace("tableInitialAutoIncrement: " + schemaName + "."
                 + tableName + " = " + initialAutoIncrementValue);
-        UserTable table = ais.getUserTable(schemaName, tableName);
-        checkFound(table, "setting initial autoincrement value", "user table",
+        Table table = ais.getTable(schemaName, tableName);
+        checkFound(table, "setting initial autoincrement value", "table",
                 concat(schemaName, tableName));
         table.setInitialAutoIncrementValue(initialAutoIncrementValue);
         return table;
@@ -121,7 +124,7 @@
                 String charset, String collation, String defaultValue, String defaultFunction) {
         LOG.trace("column: " + schemaName + "." + tableName + "." + columnName);
         Columnar table = ais.getColumnar(schemaName, tableName);
-        checkFound(table, "creating column", "user table",
+        checkFound(table, "creating column", "table",
                 concat(schemaName, tableName));
         Type type = ais.getType(typeName);
         checkFound(type, "creating column", "type", typeName);
@@ -232,7 +235,7 @@
     public void fullTextIndex(TableName tableName, String indexName)
     {
         LOG.trace("fullTextIndex: " + tableName + "." + indexName);
-        UserTable table = ais.getUserTable(tableName);
+        Table table = ais.getTable(tableName);
         checkFound(table, "creating full text index", "table", tableName);
         int indexID = nameGenerator.generateIndexID(getRooTableID(table));
         Index index = FullTextIndex.create(ais, table, indexName, indexID);
@@ -242,7 +245,7 @@
                                     String schemaName, String tableName, String columnName, Integer position)
     {
         LOG.trace("fullTextIndexColumn: " + indexedTableName + "." + indexName + ":" + columnName);
-        UserTable indexedTable = ais.getUserTable(indexedTableName);
+        Table indexedTable = ais.getTable(indexedTableName);
         checkFound(indexedTable, "creating full text index column", "table", indexedTableName);
         Index index = indexedTable.getFullTextIndex(indexName);
         checkFound(index, "creating full text index column", "index", concat(tableName.toString(), indexName));
@@ -259,10 +262,10 @@
         LOG.trace("joinTables: " + joinName + ": " + childSchemaName + "."
                 + childTableName + " -> " + parentSchemaName + "."
                 + parentTableName);
-        UserTable child = ais.getUserTable(childSchemaName, childTableName);
+        Table child = ais.getTable(childSchemaName, childTableName);
         checkFound(child, "creating join", "child table",
                 concat(childSchemaName, childTableName));
-        UserTable parent = ais.getUserTable(parentSchemaName, parentTableName);
+        Table parent = ais.getTable(parentSchemaName, parentTableName);
         if (parent == null) {
             TableName parentName = new TableName(parentSchemaName,
                     parentTableName);
@@ -285,16 +288,16 @@
                 + parentSchemaName + "." + parentTableName + "."
                 + parentColumnName);
         // Get child info
-        UserTable childTable = ais
-                .getUserTable(childSchemaName, childTableName);
+        Table childTable = ais
+                .getTable(childSchemaName, childTableName);
         checkFound(childTable, "creating join column", "child table",
                 concat(childSchemaName, childTableName));
         Column childColumn = childTable.getColumn(childColumnName);
         checkFound(childColumn, "creating join column", "child column",
                 concat(childSchemaName, childTableName, childColumnName));
         // Handle parent - could be a forward reference
-        UserTable parentTable = ais.getUserTable(parentSchemaName,
-                parentTableName);
+        Table parentTable = ais.getTable(parentSchemaName,
+                                             parentTableName);
         if (parentTable == null) {
             // forward reference
             ForwardTableReference forwardTableReference = forwardReferences
@@ -408,10 +411,10 @@
     public void basicSchemaIsComplete() {
         LOG.trace("basicSchemaIsComplete");
         for (ForwardTableReference forwardTableReference : forwardReferences.values()) {
-            UserTable childTable = forwardTableReference.childTable();
-            UserTable parentTable = ais.getUserTable(forwardTableReference
-                    .parentTableName().getSchemaName(), forwardTableReference
-                    .parentTableName().getTableName());
+            Table childTable = forwardTableReference.childTable();
+            Table parentTable = ais.getTable(forwardTableReference
+                                                         .parentTableName().getSchemaName(), forwardTableReference
+                                                         .parentTableName().getTableName());
             
             if (parentTable != null){
                 Join join = Join.create(ais, forwardTableReference.joinName(),
@@ -449,8 +452,8 @@
         Group group = ais.getGroup(groupName);
         checkFound(group, "deleting group", "group", groupName);
         boolean groupEmpty = true;
-        for (UserTable userTable : ais.getUserTables().values()) {
-            if (userTable.getGroup() == group) {
+        for (Table table : ais.getTables().values()) {
+            if (table.getGroup() == group) {
                 groupEmpty = false;
             }
         }
@@ -474,7 +477,7 @@
         Group group = ais.getGroup(groupName);
         checkFound(group, "adding table to group", "group", groupName);
         // table
-        UserTable table = ais.getUserTable(schemaName, tableName);
+        Table table = ais.getTable(schemaName, tableName);
         checkFound(table, "adding table to group", "table",
                 concat(schemaName, tableName));
         checkGroupAddition(group, table.getGroup(),
@@ -504,7 +507,7 @@
         // parent
         String parentSchemaName = join.getParent().getName().getSchemaName();
         String parentTableName = join.getParent().getName().getTableName();
-        UserTable parent = ais.getUserTable(parentSchemaName, parentTableName);
+        Table parent = ais.getTable(parentSchemaName, parentTableName);
         checkFound(parent, "adding join to group", "parent table",
                 concat(parentSchemaName, parentTableName));
         checkGroupAddition(group, parent.getGroup(),
@@ -513,7 +516,7 @@
         // child
         String childSchemaName = join.getChild().getName().getSchemaName();
         String childTableName = join.getChild().getName().getTableName();
-        UserTable child = ais.getUserTable(childSchemaName, childTableName);
+        Table child = ais.getTable(childSchemaName, childTableName);
         checkFound(child, "adding join to group", "child table",
                 concat(childSchemaName, childTableName));
         checkGroupAddition(group, child.getGroup(),
@@ -539,7 +542,7 @@
         Group group = ais.getGroup(groupName);
         checkFound(group, "removing join from group", "group", groupName);
         // table
-        UserTable table = ais.getUserTable(schemaName, tableName);
+        Table table = ais.getTable(schemaName, tableName);
         checkFound(table, "removing join from group", "table table",
                 concat(schemaName, tableName));
         checkInGroup(group, table, "removing join from group", "table table");
@@ -569,14 +572,14 @@
         // parent
         String parentSchemaName = join.getParent().getName().getSchemaName();
         String parentTableName = join.getParent().getName().getTableName();
-        UserTable parent = ais.getUserTable(parentSchemaName, parentTableName);
+        Table parent = ais.getTable(parentSchemaName, parentTableName);
         checkFound(parent, "removing join from group", "parent table",
                 concat(parentSchemaName, parentTableName));
         checkInGroup(group, parent, "removing join from group", "parent table");
         // child
         String childSchemaName = join.getChild().getName().getSchemaName();
         String childTableName = join.getChild().getName().getTableName();
-        UserTable child = ais.getUserTable(childSchemaName, childTableName);
+        Table child = ais.getTable(childSchemaName, childTableName);
         checkFound(child, "removing join from group", "child table",
                 concat(childSchemaName, childTableName));
         checkInGroup(group, child, "removing join from group", "child table");
@@ -605,7 +608,7 @@
         LOG.trace("moveTree: " + schemaName + "." + tableName + " -> "
                 + groupName + " via join " + joinName);
         // table
-        UserTable table = ais.getUserTable(schemaName, tableName);
+        Table table = ais.getTable(schemaName, tableName);
         checkFound(table, "moving tree", "table", concat(schemaName, tableName));
 
         // group
@@ -651,7 +654,7 @@
         LOG.trace("moveTree: " + schemaName + "." + tableName
                 + " -> empty group " + groupName);
         // table
-        UserTable table = ais.getUserTable(schemaName, tableName);
+        Table table = ais.getTable(schemaName, tableName);
         checkFound(table, "moving tree", "table", concat(schemaName, tableName));
 
         // group
@@ -685,10 +688,10 @@
             setRootIfNeeded(group);
         }
         // Create hidden PKs if needed. Needs group hooked up before it can be called (to generate index id).
-        for (UserTable userTable : ais.getUserTables().values()) {
-            userTable.endTable(nameGenerator);
+        for (Table table : ais.getTables().values()) {
+            table.endTable(nameGenerator);
             // endTable may have created new index, set its tree name if so
-            Index index = userTable.getPrimaryKeyIncludingInternal().getIndex();
+            Index index = table.getPrimaryKeyIncludingInternal().getIndex();
             if (index.getTreeName() == null) {
                 index.setTreeName(nameGenerator.generateIndexTreeName(index));
             }
@@ -698,7 +701,7 @@
     public void clearGroupings() {
         LOG.trace("clear groupings");
         ais.getGroups().clear();
-        for (UserTable table : ais.getUserTables().values()) {
+        for (Table table : ais.getTables().values()) {
             setTablesGroup(table, null);
         }
         for (Join join : ais.getJoins().values()) {
@@ -713,9 +716,9 @@
         return ais;
     }
 
-    private UserTable findRoot(Group group) {
-        UserTable root = null;
-        for(UserTable table : ais.getUserTables().values()) {
+    private Table findRoot(Group group) {
+        Table root = null;
+        for(Table table : ais.getTables().values()) {
             if((table.getGroup() == group) && table.isRoot()) {
                 if(root != null) {
                     return null; // Multiple roots
@@ -768,7 +771,7 @@
         }
     }
 
-    private void checkCycle(UserTable table, Group group) {
+    private void checkCycle(Table table, Group group) {
         if (table.getGroup() == group) {
             String exception = table + " is already in " + group
                     + ". Group must be acyclic";
@@ -869,7 +872,7 @@
 
     private class ForwardTableReference {
         public ForwardTableReference(String joinName,
-                TableName parentTableName, UserTable childTable) {
+                TableName parentTableName, Table childTable) {
             this.joinName = joinName;
             this.parentTableName = parentTableName;
             this.childTable = childTable;
@@ -883,7 +886,7 @@
             return parentTableName;
         }
 
-        public UserTable childTable() {
+        public Table childTable() {
             return childTable;
         }
 
@@ -898,7 +901,7 @@
         }
 
         private final String joinName;
-        private final UserTable childTable;
+        private final Table childTable;
         private final TableName parentTableName;
         private final List<ForwardColumnReference> forwardColumnReferences = new ArrayList<>();
     }
@@ -946,7 +949,7 @@
             super(
                     "Group "
                             + group.getName()
-                            + " cannot be deleted because it contains at least one user table.");
+                            + " cannot be deleted because it contains at least one table.");
         }
     }
 

=== modified file 'src/main/java/com/akiban/ais/model/AISMerge.java'
--- src/main/java/com/akiban/ais/model/AISMerge.java	2013-05-28 21:18:45 +0000
+++ src/main/java/com/akiban/ais/model/AISMerge.java	2013-05-28 23:28:27 +0000
@@ -46,8 +46,8 @@
 import java.util.Set;
 
 /**
- * AISMerge is designed to merge a single UserTable definition into an existing AIS. The merge process 
- * does not assume that UserTable.getAIS() returns a validated and complete 
+ * AISMerge is designed to merge a single Table definition into an existing AIS. The merge process
+ * does not assume that Table.getAIS() returns a validated and complete
  * AkibanInformationSchema object. 
  * 
  * AISMerge makes a copy of the primaryAIS (from the constructor) before performing the merge process. 
@@ -104,7 +104,7 @@
 
     /* state */
     private final AkibanInformationSchema targetAIS;
-    private final UserTable sourceTable;
+    private final Table sourceTable;
     private final NameGenerator nameGenerator;
     private final MergeType mergeType;
     private final List<JoinChange> changedJoins;
@@ -113,12 +113,12 @@
 
 
     /** Legacy test constructor. Creates an AISMerge for adding a table with a new {@link DefaultNameGenerator}. */
-    AISMerge(AkibanInformationSchema sourceAIS, UserTable newTable) {
+    AISMerge(AkibanInformationSchema sourceAIS, Table newTable) {
         this(new DefaultNameGenerator(sourceAIS), copyAISForAdd(sourceAIS), newTable, MergeType.ADD_TABLE, null, null, null);
     }
 
     /** Create a new AISMerge to be used for adding a new table. */
-    public static AISMerge newForAddTable(NameGenerator generator, AkibanInformationSchema sourceAIS, UserTable newTable) {
+    public static AISMerge newForAddTable(NameGenerator generator, AkibanInformationSchema sourceAIS, Table newTable) {
         return new AISMerge(generator, copyAISForAdd(sourceAIS), newTable, MergeType.ADD_TABLE, null, null, null);
     }
 
@@ -141,7 +141,7 @@
         return new AISMerge(generator, copyAISForAdd(sourceAIS), null, MergeType.OTHER, null, null, null);
     }
 
-    private AISMerge(NameGenerator nameGenerator, AkibanInformationSchema targetAIS, UserTable sourceTable,
+    private AISMerge(NameGenerator nameGenerator, AkibanInformationSchema targetAIS, Table sourceTable,
                      MergeType mergeType, List<JoinChange> changedJoins, Map<IndexName,IndexInfo> indexesToFix,
                      List<IdentityInfo> identityToFix) {
         this.nameGenerator = nameGenerator;
@@ -166,11 +166,11 @@
     {
         final Set<Sequence> excludedSequences = new HashSet<>();
         final Set<Group> excludedGroups = new HashSet<>();
-        final Map<TableName,UserTable> filteredTables = new HashMap<>();
+        final Map<TableName,Table> filteredTables = new HashMap<>();
         for(ChangedTableDescription desc : changedTables) {
             // Copy tree names and IDs for pre-existing table and it's indexes
-            UserTable oldTable = oldAIS.getUserTable(desc.getOldName());
-            UserTable newTable = desc.getNewDefinition();
+            Table oldTable = oldAIS.getTable(desc.getOldName());
+            Table newTable = desc.getNewDefinition();
 
             // These don't affect final outcome and may be reset later. Needed by clone process.
             if((newTable != null) && (newTable.getGroup() != null)) {
@@ -211,7 +211,7 @@
                     throw new IllegalStateException("Unhandled GroupChange: " + desc.getParentChange());
             }
 
-            UserTable indexSearchTable = newTable;
+            Table indexSearchTable = newTable;
             if(newTable == null) {
                 indexSearchTable = oldTable;
             } else {
@@ -287,7 +287,7 @@
      * Returns the final, updated AkibanInformationSchema. This AIS has been fully 
      * validated and is frozen (no more changes), hence ready for update into the
      * server. 
-     * @return - the primaryAIS, after merge() with the UserTable added.
+     * @return - the primaryAIS, after merge() with the Table added.
      */
     public AkibanInformationSchema getAIS () {
         return targetAIS;
@@ -323,7 +323,7 @@
             case TABLE:
             {
                 final TableName tableName = new TableName(indexName.getSchemaName(), indexName.getTableName());
-                final UserTable newTable = targetAIS.getUserTable(tableName);
+                final Table newTable = targetAIS.getTable(tableName);
                 if(newTable == null) {
                     throw new NoSuchTableException(tableName);
                 }
@@ -350,7 +350,7 @@
             case FULL_TEXT:
             {
                 final TableName tableName = new TableName(indexName.getSchemaName(), indexName.getTableName());
-                final UserTable newTable = targetAIS.getUserTable(tableName);
+                final Table newTable = targetAIS.getTable(tableName);
                 if(newTable == null) {
                     throw new NoSuchTableException(tableName);
                 }
@@ -377,7 +377,7 @@
 
         for(IndexColumn indexCol : index.getKeyColumns()) {
             final TableName refTableName = indexCol.getColumn().getTable().getName();
-            final UserTable newRefTable = targetAIS.getUserTable(refTableName);
+            final Table newRefTable = targetAIS.getTable(refTableName);
             if(newRefTable == null) {
                 throw new NoSuchTableException(refTableName);
             }
@@ -406,7 +406,7 @@
 
     private void doAddTableMerge() {
         // I should use TableSubsetWriter(new AISTarget(targetAIS))
-        // but that assumes the UserTable.getAIS() is complete and valid. 
+        // but that assumes the Table.getAIS() is complete and valid.
         // i.e. has a group and group table, joins are accurate, etc. 
         // this may not be true 
         // Also the tableIDs need to be assigned correctly, which 
@@ -419,14 +419,14 @@
         if (sourceTable.getParentJoin() != null) {
             String parentSchemaName = sourceTable.getParentJoin().getParent().getName().getSchemaName();
             String parentTableName = sourceTable.getParentJoin().getParent().getName().getTableName(); 
-            UserTable parentTable = targetAIS.getUserTable(parentSchemaName, parentTableName);
+            Table parentTable = targetAIS.getTable(parentSchemaName, parentTableName);
             if (parentTable == null) {
                 throw new JoinToUnknownTableException (sourceTable.getName(), new TableName(parentSchemaName, parentTableName));
             }
             targetGroup = parentTable.getGroup();
         }
 
-        // Add the user table to the targetAIS
+        // Add the table to the targetAIS
         addTable (builder, sourceTable, targetGroup);
 
         // Joins or group table?
@@ -446,7 +446,7 @@
             TableIndex index = sourceTable.getPrimaryKey().getIndex();
             final int rootTableID = (targetGroup != null) ? 
                     targetGroup.getRoot().getTableId() : 
-                        builder.akibanInformationSchema().getUserTable(sourceTable.getName()).getTableId();
+                        builder.akibanInformationSchema().getTable(sourceTable.getName()).getTableId();
             IndexName indexName = index.getIndexName();
             builder.index(sourceTable.getName().getSchemaName(), 
                     sourceTable.getName().getTableName(),
@@ -487,7 +487,7 @@
 
         // Fix up groups
         for(JoinChange tnj : changedJoins) {
-            final UserTable table = targetAIS.getUserTable(tnj.newChildName);
+            final Table table = targetAIS.getTable(tnj.newChildName);
             if(tnj.isNewGroup) {
                 addNewGroup(builder, table);
             } else if(tnj.newParentName != null) {
@@ -501,7 +501,7 @@
         for(Map.Entry<IndexName,IndexInfo> entry : indexesToFix.entrySet()) {
             IndexName name = entry.getKey();
             IndexInfo info = entry.getValue();
-            UserTable table = targetAIS.getUserTable(name.getSchemaName(), name.getTableName());
+            Table table = targetAIS.getTable(name.getSchemaName(), name.getTableName());
             Index index = table.getIndexIncludingInternal(name.getName());
             index.setIndexId((info.id != null) ? info.id : newIndexID(table.getGroup()));
             index.setTreeName((info.tree != null) ? info.tree : nameGenerator.generateIndexTreeName(index));
@@ -523,10 +523,10 @@
         builder.akibanInformationSchema().freeze();
     }
 
-    private void addTable(AISBuilder builder, final UserTable table, final Group targetGroup) {
+    private void addTable(AISBuilder builder, final Table table, final Group targetGroup) {
         
         // I should use TableSubsetWriter(new AISTarget(targetAIS)) or AISCloner.clone()
-        // but both assume the UserTable.getAIS() is complete and valid. 
+        // but both assume the Table.getAIS() is complete and valid.
         // i.e. has a group and group table, and the joins point to a valid table
         // which, given the use of AISMerge, is not true. 
         
@@ -535,9 +535,8 @@
         final String tableName = table.getName().getTableName();
         
 
-        builder.userTable(schemaName, tableName);
-        UserTable targetTable = targetAIS.getUserTable(schemaName, tableName); 
-        targetTable.setEngine(table.getEngine());
+        builder.table(schemaName, tableName);
+        Table targetTable = targetAIS.getTable(schemaName, tableName);
         targetTable.setCharsetAndCollation(table.getCharsetAndCollation());
         targetTable.setPendingOSC(table.getPendingOSC());
         targetTable.setUuid(table.getUuid());
@@ -582,7 +581,7 @@
         LOG.debug("Generated sequence: {}, with tree name; {}", sequenceName, newSeq.getTreeName());
     }
 
-    private void addNewGroup (AISBuilder builder, UserTable rootTable) {
+    private void addNewGroup (AISBuilder builder, Table rootTable) {
         TableName groupName = rootTable.getName();
         builder.createGroup(groupName.getTableName(), groupName.getSchemaName());
         builder.addTableToGroup(groupName,
@@ -590,7 +589,7 @@
                                 rootTable.getName().getTableName());
     }
 
-    private void addJoin (AISBuilder builder, Join join, UserTable childTable) {
+    private void addJoin (AISBuilder builder, Join join, Table childTable) {
         Map<String,String> emptyMap = Collections.emptyMap();
         addJoin(builder, join.getParent().getName(), emptyMap, join, emptyMap, childTable);
     }
@@ -601,10 +600,10 @@
     }
 
     private void addJoin (AISBuilder builder, TableName parentName, Map<String,String> parentCols,
-                          Join join, Map<String,String> childCols, UserTable childTable) {
+                          Join join, Map<String,String> childCols, Table childTable) {
         String parentSchemaName = parentName.getSchemaName();
         String parentTableName = parentName.getTableName();
-        UserTable parentTable = targetAIS.getUserTable(parentSchemaName, parentTableName);
+        Table parentTable = targetAIS.getTable(parentSchemaName, parentTableName);
         if (parentTable == null) {
             throw new JoinToUnknownTableException(childTable.getName(), new TableName(parentSchemaName, parentTableName));
          }

=== modified file 'src/main/java/com/akiban/ais/model/AISSchemaChanger.java'
--- src/main/java/com/akiban/ais/model/AISSchemaChanger.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/AISSchemaChanger.java	2013-05-28 23:28:27 +0000
@@ -92,8 +92,8 @@
     }
 
     @Override
-    public void visitUserTable(UserTable userTable)
+    public void visitTable(Table table)
     {
-        updateTableName( userTable );
+        updateTableName(table);
     }
 }

=== modified file 'src/main/java/com/akiban/ais/model/AISTableNameChanger.java'
--- src/main/java/com/akiban/ais/model/AISTableNameChanger.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/AISTableNameChanger.java	2013-05-28 23:28:27 +0000
@@ -20,18 +20,18 @@
 import java.util.ArrayList;
 
 public class AISTableNameChanger {
-    public AISTableNameChanger(UserTable table)
+    public AISTableNameChanger(Table table)
     {
         this.table = table;
         this.newSchemaName = table.getName().getSchemaName();
         this.newTableName = table.getName().getTableName();
     }
 
-    public AISTableNameChanger(UserTable table, TableName newName) {
+    public AISTableNameChanger(Table table, TableName newName) {
         this(table, newName.getSchemaName(), newName.getTableName());
     }
 
-    public AISTableNameChanger(UserTable table, String newSchemaName, String newTableName) {
+    public AISTableNameChanger(Table table, String newSchemaName, String newTableName) {
         this.table = table;
         this.newSchemaName = newSchemaName;
         this.newTableName = newTableName;
@@ -71,11 +71,11 @@
         }
         // Rename the table and put back in AIS
         table.setTableName(newName);
-        ais.addUserTable(table);
+        ais.addTable(table);
     }
 
 
-    UserTable table;
+    Table table;
     String newSchemaName;
     String newTableName;
 }

=== modified file 'src/main/java/com/akiban/ais/model/AkibanInformationSchema.java'
--- src/main/java/com/akiban/ais/model/AkibanInformationSchema.java	2013-04-12 22:11:57 +0000
+++ src/main/java/com/akiban/ais/model/AkibanInformationSchema.java	2013-05-28 23:28:27 +0000
@@ -102,39 +102,29 @@
         return groups;
     }
 
-    public Map<TableName, UserTable> getUserTables()
+    public Map<TableName,Table> getTables()
     {
-        return userTables;
+        return tables;
     }
 
     public void removeGroup(Group group) {
         groups.remove(group.getName());
     }
 
-    public Table getTable(String schemaName, String tableName)
-    {
-        return getUserTable(schemaName, tableName);
-    }
-
-    public Table getTable(TableName tableName)
-    {
-        return getUserTable(tableName);
-    }
-
-    public UserTable getUserTable(final String schemaName, final String tableName)
-    {
-        return getUserTable(new TableName(schemaName, tableName));
-    }
-
-    public UserTable getUserTable(final TableName tableName)
-    {
-        return userTables.get(tableName);
-    }
-
-    public synchronized UserTable getUserTable(int tableId)
+    public Table getTable(final String schemaName, final String tableName)
+    {
+        return getTable(new TableName(schemaName, tableName));
+    }
+
+    public Table getTable(final TableName tableName)
+    {
+        return tables.get(tableName);
+    }
+
+    public synchronized Table getTable(int tableId)
     {
         ensureTableIdLookup();
-        return userTablesById.get(tableId);
+        return tablesById.get(tableId);
     }
 
     public Map<TableName, View> getViews()
@@ -272,9 +262,9 @@
         for (Type type : types.values()) {
             visitor.visitType(type);
         }
-        for (UserTable userTable : userTables.values()) {
-            visitor.visitUserTable(userTable);
-            userTable.traversePreOrder(visitor);
+        for (Table table : tables.values()) {
+            visitor.visitTable(table);
+            table.traversePreOrder(visitor);
         }
         for (Join join : joins.values()) {
             visitor.visitJoin(join);
@@ -292,9 +282,9 @@
         for (Type type : types.values()) {
             visitor.visitType(type);
         }
-        for (UserTable userTable : userTables.values()) {
-            userTable.traversePostOrder(visitor);
-            visitor.visitUserTable(userTable);
+        for (Table table : tables.values()) {
+            table.traversePostOrder(visitor);
+            visitor.visitTable(table);
         }
         for (Join join : joins.values()) {
             join.traversePreOrder(visitor);
@@ -313,10 +303,10 @@
         groups.put(group.getName(), group);
     }
 
-    public void addUserTable(UserTable table)
+    public void addTable(Table table)
     {
         TableName tableName = table.getName();
-        userTables.put(tableName, table);
+        tables.put(tableName, table);
 
         // TODO: Create on demand until Schema is more of a first class citizen
         Schema schema = getSchema(tableName.getSchemaName());
@@ -324,7 +314,7 @@
             schema = new Schema(tableName.getSchemaName());
             addSchema(schema);
         }
-        schema.addUserTable(table);
+        schema.addTable(table);
     }
 
     public void addView(View view)
@@ -452,11 +442,9 @@
      * @deprecated - use {@link #validate(Collection)}
      * @param out
      * @param tables
-     * @param isUserTable
      * @param seenTables
      */
-    private void checkTables(List<String> out, Map<TableName, ? extends Table> tables,
-                             boolean isUserTable, Set<TableName> seenTables)
+    private void checkTables(List<String> out, Map<TableName, ? extends Table> tables, Set<TableName> seenTables)
     {
         for (Map.Entry<TableName, ? extends Table> entry : tables.entrySet())
         {
@@ -471,12 +459,6 @@
             else if (!tableName.equals(table.getName())) {
                 out.add("name mismatch, expected <" + tableName + "> for table " + table);
             }
-            else if(table.isGroupTable() == isUserTable) {
-                out.add("wrong value for isGroupTable(): " + tableName);
-            }
-            else if (table.isUserTable() != isUserTable) {
-                out.add("wrong value for isUserTable(): " + tableName);
-            }
             else if (!seenTables.add(tableName)) {
                 out.add("duplicate table name: " + tableName);
             }
@@ -509,13 +491,13 @@
             }
             else if(join.checkIntegrity(out))
             {
-                UserTable child = join.getChild();
-                UserTable parent = join.getParent();
-                if (!userTables.containsKey(child.getName())) {
-                    out.add("child not in user tables list: " + child.getName());
+                Table child = join.getChild();
+                Table parent = join.getParent();
+                if (!tables.containsKey(child.getName())) {
+                    out.add("child not in tables list: " + child.getName());
                 }
-                else if (!userTables.containsKey(parent.getName())) {
-                    out.add("parent not in user tables list: " + child.getName());
+                else if (!tables.containsKey(parent.getName())) {
+                    out.add("parent not in tables list: " + child.getName());
                 }
                 else if (join.getAIS() != this) {
                     out.add("AIS self-reference failure");
@@ -578,8 +560,8 @@
     public void checkIntegrity(List<String> out) throws IllegalStateException
     {
         checkGroups(out);
-        Set<TableName> seenTables = new HashSet<>(userTables.size(), 1.0f);
-        checkTables(out, userTables, true, seenTables);
+        Set<TableName> seenTables = new HashSet<>(tables.size(), 1.0f);
+        checkTables(out, tables, seenTables);
         checkJoins(out);
         checkTypesNames(out);
     }
@@ -620,21 +602,21 @@
 
     synchronized void invalidateTableIdMap()
     {
-        userTablesById = null;
+        tablesById = null;
     }
 
     private void ensureTableIdLookup()
     {
-        if (userTablesById == null) {
-            userTablesById = new HashMap<>();
-            for (UserTable userTable : userTables.values()) {
-                userTablesById.put(userTable.getTableId(), userTable);
+        if (tablesById == null) {
+            tablesById = new HashMap<>();
+            for (Table table : tables.values()) {
+                tablesById.put(table.getTableId(), table);
             }
         }
     }
 
     void removeTable(TableName name) {
-        userTables.remove(name);
+        tables.remove(name);
         Schema schema = getSchema(name.getSchemaName());
         if (schema != null) {
             schema.removeTable(name.getTableName());
@@ -710,7 +692,7 @@
     private static String defaultCollation = "utf8_bin";
 
     private final Map<TableName, Group> groups = new TreeMap<>();
-    private final Map<TableName, UserTable> userTables = new TreeMap<>();
+    private final Map<TableName,Table> tables = new TreeMap<>();
     private final Map<TableName, Sequence> sequences = new TreeMap<>();
     private final Map<TableName, View> views = new TreeMap<>();
     private final Map<TableName, Routine> routines = new TreeMap<>();
@@ -722,7 +704,7 @@
     private final ConcurrentMap cachedValues = new ConcurrentHashMap(4,0.75f,4); // Very few, write-once entries expected
     private long generation = -1;
 
-    private Map<Integer, UserTable> userTablesById = null;
+    private Map<Integer,Table> tablesById = null;
     private boolean isFrozen = false;
 
     private static class AISFailureList extends AISValidationResults implements AISValidationOutput {

=== modified file 'src/main/java/com/akiban/ais/model/Column.java'
--- src/main/java/com/akiban/ais/model/Column.java	2013-04-28 02:44:03 +0000
+++ src/main/java/com/akiban/ais/model/Column.java	2013-05-28 23:28:27 +0000
@@ -257,12 +257,7 @@
 
     public Table getTable()
     {
-        return (Table) table;
-    }
-
-    public UserTable getUserTable()
-    {
-        return (UserTable) getTable();
+        return (Table)table;
     }
 
     /**

=== modified file 'src/main/java/com/akiban/ais/model/DefaultIndexNameGenerator.java'
--- src/main/java/com/akiban/ais/model/DefaultIndexNameGenerator.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/DefaultIndexNameGenerator.java	2013-05-28 23:28:27 +0000
@@ -18,7 +18,6 @@
 package com.akiban.ais.model;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -29,7 +28,7 @@
         indexNames.addAll(initialIndexNames);
     }
 
-    public static DefaultIndexNameGenerator forTable(UserTable table) {
+    public static DefaultIndexNameGenerator forTable(Table table) {
         Set<String> indexNames = new HashSet<>();
         for(Index index : table.getIndexesIncludingInternal()) {
             indexNames.add(index.getIndexName().getName());

=== modified file 'src/main/java/com/akiban/ais/model/DefaultNameGenerator.java'
--- src/main/java/com/akiban/ais/model/DefaultNameGenerator.java	2013-04-15 19:20:36 +0000
+++ src/main/java/com/akiban/ais/model/DefaultNameGenerator.java	2013-05-28 23:28:27 +0000
@@ -44,14 +44,14 @@
     private final Set<String> treeNames;
     private final Set<TableName> sequenceNames;
     private final SortedSet<Integer> isTableIDSet;
-    private final SortedSet<Integer> userTableIDSet;
+    private final SortedSet<Integer> tableIDSet;
     private final Map<Integer,Integer> indexIDMap;
 
 
     public DefaultNameGenerator() {
         treeNames = new HashSet<>();
         sequenceNames = new HashSet<>();
-        userTableIDSet = new TreeSet<>();
+        tableIDSet = new TreeSet<>();
         isTableIDSet = new TreeSet<>();
         indexIDMap = new HashMap<>();
     }
@@ -60,7 +60,7 @@
         treeNames = collectTreeNames(ais);
         sequenceNames = new HashSet<>(ais.getSequences().keySet());
         isTableIDSet = collectTableIDs(ais, true);
-        userTableIDSet = collectTableIDs(ais, false);
+        tableIDSet = collectTableIDs(ais, false);
         indexIDMap = collectMaxIndexIDs(ais);
     }
 
@@ -137,7 +137,7 @@
                 tableName = ((TableIndex)index).getTable().getName();
             break;
             case GROUP:
-                UserTable root = ((GroupIndex)index).getGroup().getRoot();
+                Table root = ((GroupIndex)index).getGroup().getRoot();
                 if(root == null) {
                     throw new IllegalArgumentException("Grouping incomplete (no root)");
                 }
@@ -174,7 +174,7 @@
     @Override
     public void removeTableID(int tableID) {
         isTableIDSet.remove(tableID);
-        userTableIDSet.remove(tableID);
+        tableIDSet.remove(tableID);
     }
 
     @Override
@@ -199,15 +199,15 @@
         if(isISTable) {
             nextID = isTableIDSet.isEmpty() ? IS_TABLE_ID_OFFSET : isTableIDSet.last() + 1;
         } else {
-            nextID = userTableIDSet.isEmpty() ? USER_TABLE_ID_OFFSET : userTableIDSet.last() + 1;
+            nextID = tableIDSet.isEmpty() ? USER_TABLE_ID_OFFSET : tableIDSet.last() + 1;
         }
-        while(isTableIDSet.contains(nextID) || userTableIDSet.contains(nextID)) {
+        while(isTableIDSet.contains(nextID) || tableIDSet.contains(nextID)) {
             nextID += 1;
         }
         if(isISTable) {
             isTableIDSet.add(nextID);
         } else {
-            userTableIDSet.add(nextID);
+            tableIDSet.add(nextID);
         }
         return nextID;
     }
@@ -218,7 +218,7 @@
             if(TableName.INFORMATION_SCHEMA.equals(schema.getName()) != onlyISTables) {
                 continue;
             }
-            for(UserTable table : schema.getUserTables().values()) {
+            for(Table table : schema.getTables().values()) {
                 idSet.add(table.getTableId());
             }
         }
@@ -243,7 +243,7 @@
                 treeNames.add(index.getTreeName());
             }
         }
-        for(UserTable table : ais.getUserTables().values()) {
+        for(Table table : ais.getTables().values()) {
             for(Index index : table.getIndexesIncludingInternal()) {
                 treeNames.add(index.getTreeName());
             }
@@ -313,7 +313,7 @@
         }
 
         @Override
-        public void visitUserTable(UserTable table) {
+        public void visitTable(Table table) {
             checkIndexes(table.getIndexesIncludingInternal());
         }
 

=== modified file 'src/main/java/com/akiban/ais/model/FullTextIndex.java'
--- src/main/java/com/akiban/ais/model/FullTextIndex.java	2013-03-28 02:28:43 +0000
+++ src/main/java/com/akiban/ais/model/FullTextIndex.java	2013-05-28 23:28:27 +0000
@@ -61,11 +61,11 @@
     public Table leafMostTable() {
         // This is not entirely well-defined, since more than one
         // descendant to the same depth can be indexed.
-        UserTable deepest = null;
+        Table deepest = null;
         for (IndexColumn indexColumn : keyColumns) {
             if ((deepest == null) || 
-                (indexColumn.getColumn().getUserTable().getDepth() > deepest.getDepth())) {
-                deepest = indexColumn.getColumn().getUserTable();
+                (indexColumn.getColumn().getTable().getDepth() > deepest.getDepth())) {
+                deepest = indexColumn.getColumn().getTable();
             }
         }
         return deepest;
@@ -73,11 +73,11 @@
 
     @Override
     public Table rootMostTable() {
-        UserTable shallowest = null;
+        Table shallowest = null;
         for (IndexColumn indexColumn : keyColumns) {
             if ((shallowest == null) || 
-                (indexColumn.getColumn().getUserTable().getDepth() < shallowest.getDepth())) {
-                shallowest = indexColumn.getColumn().getUserTable();
+                (indexColumn.getColumn().getTable().getDepth() < shallowest.getDepth())) {
+                shallowest = indexColumn.getColumn().getTable();
             }
         }
         return shallowest;
@@ -99,7 +99,7 @@
 
     @Override
     public void addColumn(IndexColumn indexColumn) {
-        UserTable table = indexColumn.getColumn().getUserTable();
+        Table table = indexColumn.getColumn().getTable();
         if (!((table == indexedTable) ||
               table.isDescendantOf(indexedTable) ||
               indexedTable.isDescendantOf(table))) {
@@ -119,12 +119,12 @@
 
     /* FullTextIndex */
 
-    public UserTable getIndexedTable() {
+    public Table getIndexedTable() {
         return indexedTable;
     }
 
     public static FullTextIndex create(AkibanInformationSchema ais,
-                                       UserTable table, String indexName, 
+                                       Table table, String indexName,
                                        Integer indexId)
     {
         ais.checkMutability();
@@ -137,11 +137,11 @@
 
     public static final String FULL_TEXT_CONSTRAINT = "FULL_TEXT";
 
-    public FullTextIndex(UserTable indexedTable, String indexName, Integer indexId)
+    public FullTextIndex(Table indexedTable, String indexName, Integer indexId)
     {
         super(indexedTable.getName(), indexName, indexId, false, FULL_TEXT_CONSTRAINT);
         this.indexedTable = indexedTable;
     }
     
-    private final UserTable indexedTable;
+    private final Table indexedTable;
 }

=== modified file 'src/main/java/com/akiban/ais/model/Group.java'
--- src/main/java/com/akiban/ais/model/Group.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/Group.java	2013-05-28 23:28:27 +0000
@@ -64,12 +64,12 @@
         return name.toString();
     }
 
-    public void setRootTable(UserTable rootTable)
+    public void setRootTable(Table rootTable)
     {
         this.rootTable = rootTable;
     }
 
-    public UserTable getRoot()
+    public Table getRoot()
     {
         return rootTable;
     }
@@ -182,5 +182,5 @@
     private final Map<String, GroupIndex> indexMap;
     private final AtomicReference<TreeCache> treeCache = new AtomicReference<>();
     private String treeName;
-    private UserTable rootTable;
+    private Table rootTable;
 }

=== modified file 'src/main/java/com/akiban/ais/model/GroupIndex.java'
--- src/main/java/com/akiban/ais/model/GroupIndex.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/GroupIndex.java	2013-05-28 23:28:27 +0000
@@ -28,14 +28,14 @@
     // Index interface
 
     @Override
-    public UserTable leafMostTable()
+    public Table leafMostTable()
     {
         assert !tablesByDepth.isEmpty() : "no tables participate in this group index";
         return tablesByDepth.lastEntry().getValue().table;
     }
 
     @Override
-    public UserTable rootMostTable()
+    public Table rootMostTable()
     {
         assert !tablesByDepth.isEmpty() : "no tables participate in this group index";
         return tablesByDepth.firstEntry().getValue().table;
@@ -51,8 +51,8 @@
     public Collection<Integer> getAllTableIDs()
     {
         List<Integer> branchIDs = new ArrayList<>(tablesByDepth.size());
-        for (UserTable userTable = leafMostTable(); userTable != null; userTable = userTable.parentTable()) {
-            branchIDs.add(userTable.getTableId());
+        for (Table table = leafMostTable(); table != null; table = table.parentTable()) {
+            branchIDs.add(table.getTableId());
         }
         return branchIDs;
     }
@@ -61,11 +61,11 @@
     public void addColumn(IndexColumn indexColumn)
     {
         Table indexGenericTable = indexColumn.getColumn().getTable();
-        if (!(indexGenericTable instanceof UserTable)) {
+        if (!(indexGenericTable instanceof Table)) {
             throw new IndexColNotInGroupException(indexColumn.getIndex().getIndexName().getName(),
                                                   indexColumn.getColumn().getName());
         }
-        UserTable indexTable = (UserTable) indexGenericTable;
+        Table indexTable = indexGenericTable;
         Integer indexTableDepth = indexTable.getDepth();
         assert indexTableDepth != null;
 
@@ -99,19 +99,19 @@
     @Override
     public void computeFieldAssociations(Map<Table, Integer> ordinalMap)
     {
-        List<UserTable> branchTables = new ArrayList<>();
-        for (UserTable userTable = leafMostTable(); userTable != null; userTable = userTable.parentTable()) {
-            branchTables.add(userTable);
+        List<Table> branchTables = new ArrayList<>();
+        for (Table table = leafMostTable(); table != null; table = table.parentTable()) {
+            branchTables.add(table);
         }
         Collections.reverse(branchTables);
 
-        Map<UserTable, Integer> offsetsMap = new HashMap<>();
+        Map<Table, Integer> offsetsMap = new HashMap<>();
         int offset = 0;
         columnsPerFlattenedField = new ArrayList<>();
-        for (UserTable userTable : branchTables) {
-            offsetsMap.put(userTable, offset);
-            offset += userTable.getColumnsIncludingInternal().size();
-            columnsPerFlattenedField.addAll(userTable.getColumnsIncludingInternal());
+        for (Table table : branchTables) {
+            offsetsMap.put(table, offset);
+            offset += table.getColumnsIncludingInternal().size();
+            columnsPerFlattenedField.addAll(table.getColumnsIncludingInternal());
         }
         computeFieldAssociations(ordinalMap, offsetsMap);
         // Complete computation of inIndex bitsets
@@ -131,7 +131,7 @@
     // A row of the given table is being changed in the columns described by modifiedColumnPositions.
     // Return true iff there are any columns in common with those columns of the table contributing to the
     // index. A result of false means that the row change need not result in group index maintenance.
-    public boolean columnsOverlap(UserTable table, BitSet modifiedColumnPositions)
+    public boolean columnsOverlap(Table table, BitSet modifiedColumnPositions)
     {
         ParticipatingTable participatingTable = tablesByDepth.get(table.getDepth());
         if (participatingTable != null) {
@@ -241,7 +241,7 @@
     private void computeHKeyDerivations(Map<Table, Integer> ordinalMap)
     {
         indexToHKeys = new IndexToHKey[leafMostTable().getDepth() + 1];
-        UserTable table = leafMostTable();
+        Table table = leafMostTable();
         while (table != null) {
             int tableDepth = table.getDepth();
             assert tableDepth <= leafMostTable().getDepth() : table;
@@ -271,7 +271,7 @@
             case LEFT:
                 // use a rootward bias, but no more rootward than the rootmost table
                 for (Column equivalentColumn : equivalentColumns) {
-                    int equivalentColumnDepth = equivalentColumn.getUserTable().getDepth();
+                    int equivalentColumnDepth = equivalentColumn.getTable().getDepth();
                     if (undeclaredHKeyColumn == null && equivalentColumnDepth >= rootMostDepth) {
                         undeclaredHKeyColumn = equivalentColumn;
                     }
@@ -284,7 +284,7 @@
                     reverseCols.hasPrevious();)
                 {
                     Column equivalentColumn = reverseCols.previous();
-                    int equivalentColumnDepth = equivalentColumn.getUserTable().getDepth();
+                    int equivalentColumnDepth = equivalentColumn.getTable().getDepth();
                     if (undeclaredHKeyColumn == null && equivalentColumnDepth <= leafMostDepth) {
                         undeclaredHKeyColumn = equivalentColumn;
                     }
@@ -310,7 +310,7 @@
         //     - For a left join index, use the nearest rootward equivalent column.
         //     - For a right join index, use the nearest leafward equivalent column.
         List<Column> equivalentColumns = hKeyColumn.equivalentColumns(); // sorted by depth, root first
-        Integer targetTableDepth = hKeyColumn.column().getUserTable().getDepth();
+        Integer targetTableDepth = hKeyColumn.column().getTable().getDepth();
         if (targetTableDepth < rootMostTable().getDepth()) {
             for (int i = 0; substituteHKeyColumnPosition == -1 && i < equivalentColumns.size(); i++) {
                 Column equivalentColumn = equivalentColumns.get(i);
@@ -344,7 +344,7 @@
 
     private int depth(Column column)
     {
-        return column.getUserTable().getDepth();
+        return column.getTable().getDepth();
     }
 
     private int positionOf(Column column)
@@ -368,7 +368,7 @@
         return position;
     }
 
-    private void checkIndexTableInBranchNew(IndexColumn indexColumn, UserTable indexTable, int indexTableDepth,
+    private void checkIndexTableInBranchNew(IndexColumn indexColumn, Table indexTable, int indexTableDepth,
                                             Map.Entry<Integer, ParticipatingTable> entry, boolean entryIsRootward)
     {
         if (entry == null) {
@@ -378,10 +378,10 @@
             throw new BranchingGroupIndexException(indexColumn.getIndex().getIndexName().getName(),
                                                    indexTable.getName(), entry.getValue().table.getName());
         }
-        UserTable entryTable = entry.getValue().table;
+        Table entryTable = entry.getValue().table;
 
-        final UserTable rootward;
-        final UserTable leafward;
+        final Table rootward;
+        final Table leafward;
         if (entryIsRootward) {
             assert entry.getKey() < indexTableDepth : String.format("failed %d < %d", entry.getKey(), indexTableDepth);
             rootward = entryTable;
@@ -428,14 +428,14 @@
             }
         }
 
-        public ParticipatingTable(UserTable table)
+        public ParticipatingTable(Table table)
         {
             this.table = table;
             this.inIndex = new BitSet(table.getColumnsIncludingInternal().size());
         }
 
         // The table participating in the group index
-        final UserTable table;
+        final Table table;
         // The columns of the table that contribute to the group index key or value. This includes PK columns,
         // FK columns, and any columns declared in the key. The PK and FK columns may not always be necessary, as
         // the logic here does not account for whether the index includes the leafward or rootward side of an FK.

=== modified file 'src/main/java/com/akiban/ais/model/GroupIndexHelper.java'
--- src/main/java/com/akiban/ais/model/GroupIndexHelper.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/GroupIndexHelper.java	2013-05-28 23:28:27 +0000
@@ -25,9 +25,8 @@
         if (!indexColumn.getIndex().equals(index)) {
             throw new IllegalArgumentException("indexColumn must belong to index: " + indexColumn + "not of " + index);
         }
-        UserTable userTable = indexColumn.getColumn().getUserTable();
-        assert userTable.isUserTable() : "not a user table: " + userTable;
-        action.act(index, userTable);
+        Table table = indexColumn.getColumn().getTable();
+        action.act(index, table);
     }
 
     static void actOnGroupIndexTables(GroupIndex index, IndexAction action) {
@@ -38,15 +37,15 @@
 
     // nested classes
     private static interface IndexAction {
-        void act(GroupIndex groupIndex, UserTable onTable);
+        void act(GroupIndex groupIndex, Table onTable);
     }
 
     // class state
 
     final static IndexAction REMOVE = new IndexAction() {
         @Override
-        public void act(GroupIndex groupIndex, UserTable onTable) {
-            UserTable ancestor = onTable;
+        public void act(GroupIndex groupIndex, Table onTable) {
+            Table ancestor = onTable;
             while(ancestor != null) {
                 ancestor.removeGroupIndex(groupIndex);
                 ancestor = ancestor.parentTable();
@@ -61,8 +60,8 @@
 
     final static IndexAction ADD = new IndexAction() {
         @Override
-        public void act(GroupIndex groupIndex, UserTable onTable) {
-            UserTable ancestor = onTable;
+        public void act(GroupIndex groupIndex, Table onTable) {
+            Table ancestor = onTable;
             while(ancestor != null) {
                 ancestor.addGroupIndex(groupIndex);
                 ancestor = ancestor.parentTable();

=== modified file 'src/main/java/com/akiban/ais/model/HKey.java'
--- src/main/java/com/akiban/ais/model/HKey.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/HKey.java	2013-05-28 23:28:27 +0000
@@ -18,7 +18,6 @@
 package com.akiban.ais.model;
 
 import com.akiban.server.types.AkType;
-import com.akiban.server.types3.pvalue.PUnderlying;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,9 +42,9 @@
         return buffer.toString();
     }
     
-    public UserTable userTable()
+    public Table table()
     {
-        return (UserTable) table;
+        return table;
     }
 
     public List<HKeySegment> segments()
@@ -76,10 +75,10 @@
         this.table = table;
     }
 
-    public synchronized HKeySegment addSegment(UserTable segmentTable)
+    public synchronized HKeySegment addSegment(Table segmentTable)
     {
         assert keyDepth == null : segmentTable; // Should only be computed after HKeySegments are completely formed.
-        UserTable lastSegmentTable = segments.isEmpty() ? null : segments.get(segments.size() - 1).table();
+        Table lastSegmentTable = segments.isEmpty() ? null : segments.get(segments.size() - 1).table();
         assert segmentTable.parentTable() == lastSegmentTable;
         HKeySegment segment = new HKeySegment(this, segmentTable);
         segments.add(segment);

=== modified file 'src/main/java/com/akiban/ais/model/HKeyColumn.java'
--- src/main/java/com/akiban/ais/model/HKeyColumn.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/HKeyColumn.java	2013-05-28 23:28:27 +0000
@@ -45,7 +45,6 @@
     public List<Column> equivalentColumns()
     {
         if (equivalentColumns == null) {
-            assert column.getTable().isGroupTable() : "null equivalentColumns on non-group-table column: " + column;
             throw new UnsupportedOperationException("group tables have no equivalent columns");
         }
         return equivalentColumns;
@@ -61,17 +60,13 @@
         this.segment = segment;
         this.column = column;
         this.positionInHKey = segment.positionInHKey() + segment.columns().size() + 1;
-        if (column.getTable().isUserTable()) {
-            UserTable userTable = (UserTable) column.getTable();
-            this.equivalentColumns = Collections.unmodifiableList(userTable.matchingColumns(column));
-        } else {
-            this.equivalentColumns = null;
-        }
+        Table table = column.getTable();
+        this.equivalentColumns = Collections.unmodifiableList(table.matchingColumns(column));
     }
 
     // For use by this class
     
-    private void findDependentTables(Column column, UserTable table, List<UserTable> dependentTables)
+    private void findDependentTables(Column column, Table table, List<Table> dependentTables)
     {
         boolean dependent = false;
         for (HKeySegment segment : table.hKey().segments()) {
@@ -93,7 +88,7 @@
     private final Column column;
     private final int positionInHKey;
     // If column is a group table column, then we need to know all columns in the group table that are constrained
-    // to have matching values, e.g. customer$cid and order$cid. For a user table, equivalentColumns contains just
+    // to have matching values, e.g. customer$cid and order$cid. For a table, equivalentColumns contains just
     // column.
     private final List<Column> equivalentColumns;
 }

=== modified file 'src/main/java/com/akiban/ais/model/HKeySegment.java'
--- src/main/java/com/akiban/ais/model/HKeySegment.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/HKeySegment.java	2013-05-28 23:28:27 +0000
@@ -41,7 +41,7 @@
         return buffer.toString();
     }
 
-    public HKeySegment(HKey hKey, UserTable table)
+    public HKeySegment(HKey hKey, Table table)
     {
         this.hKey = hKey;
         this.table = table;
@@ -61,7 +61,7 @@
         return hKey;
     }
 
-    public UserTable table()
+    public Table table()
     {
         return table;
     }
@@ -85,7 +85,7 @@
     }
 
     private final HKey hKey;
-    private final UserTable table;
+    private final Table table;
     private final List<HKeyColumn> columns = new ArrayList<>();
     private final int positionInHKey;
 }

=== modified file 'src/main/java/com/akiban/ais/model/Index.java'
--- src/main/java/com/akiban/ais/model/Index.java	2013-04-11 05:51:16 +0000
+++ src/main/java/com/akiban/ais/model/Index.java	2013-05-28 23:28:27 +0000
@@ -24,7 +24,6 @@
 import com.akiban.server.geophile.Space;
 import com.akiban.server.geophile.SpaceLatLon;
 import com.akiban.server.rowdata.IndexDef;
-import com.akiban.server.service.tree.TreeService;
 import com.akiban.server.types.AkType;
 import com.akiban.server.types3.TInstance;
 import com.akiban.server.types3.Types3Switch;

=== modified file 'src/main/java/com/akiban/ais/model/IndexToHKey.java'
--- src/main/java/com/akiban/ais/model/IndexToHKey.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/IndexToHKey.java	2013-05-28 23:28:27 +0000
@@ -20,7 +20,7 @@
 /**
  * IndexToHKey is an interface useful in constructing HKey values from an index row.
  * There are two types of entries, ordinal values and index fields. An ordinal identifies
- * a user table. An index field selects a field within the index row.
+ * a table. An index field selects a field within the index row.
  */
 public class IndexToHKey
 {

=== modified file 'src/main/java/com/akiban/ais/model/Join.java'
--- src/main/java/com/akiban/ais/model/Join.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/Join.java	2013-05-28 23:28:27 +0000
@@ -27,8 +27,8 @@
 {
     public static Join create(AkibanInformationSchema ais,
                               String joinName,
-                              UserTable parent,
-                              UserTable child)
+                              Table parent,
+                              Table child)
     {
         ais.checkMutability();
         Join join = new Join(ais, joinName, parent, child);
@@ -74,12 +74,12 @@
         return joinName;
     }
 
-    public UserTable getParent()
+    public Table getParent()
     {
         return parent;
     }
 
-    public UserTable getChild()
+    public Table getChild()
     {
         return child;
     }
@@ -174,7 +174,7 @@
         joinName = newName;
     }
 
-    private Join(AkibanInformationSchema ais, String joinName, UserTable parent, UserTable child)
+    private Join(AkibanInformationSchema ais, String joinName, Table parent, Table child)
     {
         this.ais = ais;
         this.joinName = joinName;
@@ -220,9 +220,9 @@
                         out.add("join contained null child column: " + this);
                     } else if (parent == null) {
                         out.add("join contained null parent column: " + this);
-                    } else if (!child.getUserTable().equals(this.child)) {
+                    } else if (!child.getTable().equals(this.child)) {
                         out.add("child column's table wasn't child table: " + child + " <--> " + this.child);
-                    } else if (!parent.getUserTable().equals(this.parent)) {
+                    } else if (!parent.getTable().equals(this.parent)) {
                         out.add("parent column's table wasn't parent table: " + child + " <--> " + this.parent);
                     }
                 }
@@ -234,8 +234,8 @@
     // State
 
     private final AkibanInformationSchema ais;
-    private final UserTable parent;
-    private final UserTable child;
+    private final Table parent;
+    private final Table child;
     private final List<JoinColumn> joinColumns;
     private String joinName;
     private Integer weight;

=== modified file 'src/main/java/com/akiban/ais/model/NopVisitor.java'
--- src/main/java/com/akiban/ais/model/NopVisitor.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/NopVisitor.java	2013-05-28 23:28:27 +0000
@@ -27,7 +27,7 @@
     }
 
     @Override
-    public void visitUserTable(UserTable userTable) {
+    public void visitTable(Table table) {
     }
 
     @Override

=== modified file 'src/main/java/com/akiban/ais/model/PendingOSC.java'
--- src/main/java/com/akiban/ais/model/PendingOSC.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/PendingOSC.java	2013-05-28 23:28:27 +0000
@@ -21,7 +21,7 @@
 
 import java.util.List;
 
-/** Attached to a <code>UserTable</code> on which <code>ALTER</code> has been performed
+/** Attached to a <code>Table</code> on which <code>ALTER</code> has been performed
  * by <a href="http://www.percona.com/doc/percona-toolkit/2.1/pt-online-schema-change.html">pt-online-schema-change.html</a>. 
  * The same alter will be done to the <code>originalName</code> when a
  * <code>RENAME</code> is requested after all the row copying.

=== modified file 'src/main/java/com/akiban/ais/model/Schema.java'
--- src/main/java/com/akiban/ais/model/Schema.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/Schema.java	2013-05-28 23:28:27 +0000
@@ -32,20 +32,20 @@
         return name;
     }
 
-    public Map<String, UserTable> getUserTables() {
-        return userTables;
-    }
-
-    public UserTable getUserTable(String tableName) {
-        return userTables.get(tableName);
-    }
-
-    void addUserTable(UserTable userTable) {
-        userTables.put(userTable.getName().getTableName(), userTable);
+    public Map<String,Table> getTables() {
+        return tables;
+    }
+
+    public Table getTable(String tableName) {
+        return tables.get(tableName);
+    }
+
+    void addTable(Table table) {
+        tables.put(table.getName().getTableName(), table);
     }
 
     void removeTable(String tableName) {
-        userTables.remove(tableName);
+        tables.remove(tableName);
     }
 
     public Map<String, Sequence> getSequences() {
@@ -122,7 +122,7 @@
     }
 
     private final String name;
-    private final Map<String, UserTable> userTables = new TreeMap<>();
+    private final Map<String,Table> tables = new TreeMap<>();
     private final Map<String, Sequence> sequences = new TreeMap<>();
     private final Map<String, View> views = new TreeMap<>();
     private final Map<String, Routine> routines = new TreeMap<>();

=== removed file 'src/main/java/com/akiban/ais/model/Table.java'
--- src/main/java/com/akiban/ais/model/Table.java	2013-05-24 21:45:54 +0000
+++ src/main/java/com/akiban/ais/model/Table.java	1970-01-01 00:00:00 +0000
@@ -1,267 +0,0 @@
-/**
- * Copyright (C) 2009-2013 Akiban Technologies, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.akiban.ais.model;
-
-import java.util.*;
-
-import com.akiban.server.rowdata.RowDef;
-
-public abstract class Table extends Columnar implements Traversable, HasGroup
-{
-    public abstract boolean isUserTable();
-
-    @Override
-    public boolean isView() {
-        return false;
-    }
-
-    protected Table(AkibanInformationSchema ais, String schemaName, String tableName, Integer tableId)
-    {
-        super(ais, schemaName, tableName);
-        this.tableId = tableId;
-
-        this.groupIndexes = new HashSet<>();
-        this.unmodifiableGroupIndexes = Collections.unmodifiableCollection(groupIndexes);
-        this.indexMap = new TreeMap<>();
-        this.unmodifiableIndexMap = Collections.unmodifiableMap(indexMap);
-    }
-
-    public boolean isGroupTable()
-    {
-        return !isUserTable();
-    }
-
-    public Integer getTableId()
-    {
-        return tableId;
-    }
-
-    /**
-     * Temporary mutator so that prototype AIS management can renumber all
-     * the tables once created.  Longer term we want to give the table
-     * its ID when generated.
-     *
-     * @param tableId
-     */
-    public void setTableId(final int tableId)
-    {
-        this.tableId = tableId;
-    }
-
-    public Integer getOrdinal()
-    {
-        return ordinal;
-    }
-
-    public void setOrdinal(Integer ordinal)
-    {
-        this.ordinal = ordinal;
-    }
-
-    public Group getGroup()
-    {
-        return group;
-    }
-
-    public void setGroup(Group group)
-    {
-        this.group = group;
-    }
-
-    public Collection<TableIndex> getIndexes()
-    {
-        return unmodifiableIndexMap.values();
-    }
-
-    public TableIndex getIndex(String indexName)
-    {
-        return unmodifiableIndexMap.get(indexName.toLowerCase());
-    }
-
-    /**
-     * Get all GroupIndexes this table participates in, both explicit and implicit (i.e. as a declared column or
-     * as an ancestor of a declared column
-     */
-    public final Collection<GroupIndex> getGroupIndexes() {
-        return unmodifiableGroupIndexes;
-    }
-
-    public MigrationUsage getMigrationUsage() {
-        return migrationUsage;
-    }
-
-    public void setMigrationUsage(MigrationUsage migrationUsage) {
-        this.migrationUsage = migrationUsage;
-    }
-
-    protected void addIndex(TableIndex index)
-    {
-        indexMap.put(index.getIndexName().getName().toLowerCase(), index);
-    }
-
-    void clearIndexes() {
-        indexMap.clear();
-    }
-
-    final void addGroupIndex(GroupIndex groupIndex) {
-        groupIndexes.add(groupIndex);
-    }
-
-    final void removeGroupIndex(GroupIndex groupIndex) {
-        groupIndexes.remove(groupIndex);
-    }
-
-    public void removeIndexes(Collection<TableIndex> indexesToDrop) {
-        indexMap.values().removeAll(indexesToDrop);
-    }
-
-    /**
-     * <p>Our intended migration policy; the grouping algorithm must also take these values into account.</p>
-     * <p/>
-     * <p>The enums {@linkplain #KEEP_ENGINE} and {@linkplain #INCOMPATIBLE} have similar effects on grouping and
-     * migration: tables marked with these values will not be included in any groups, and during migration, their
-     * storage engine is not changed to AkibanDb. The difference between the two enums is that {@linkplain #KEEP_ENGINE}
-     * is set by the user and can later be changed to {@linkplain #AKIBAN_STANDARD} or
-     * {@linkplain @#AKIBAN_LOOKUP_TABLE}; on the other hand, {@linkplain #INCOMPATIBLE} is set during analysis and
-     * signifies that migration will not work for this table. The user should not be able to set this flag, and if
-     * this flag is set, the user should not be able to change it.</p>
-     */
-    public enum MigrationUsage
-    {
-        /**
-         * Migrate this table to AkibanDb, grouping it as a standard user table. This is just a normal migration.
-         */
-        AKIBAN_STANDARD,
-        /**
-         * Migrate this table to AkibanDb, but as a lookup table. Lookup tables are grouped alone.
-         */
-        AKIBAN_LOOKUP_TABLE,
-        /**
-         * User wants to keep this table's engine as-is; don't migrate it to AkibanDb.
-         */
-        KEEP_ENGINE,
-        /**
-         * This table can't be migrated to AkibanDb.
-         */
-        INCOMPATIBLE;
-
-        /**
-         * Returns whether this usage requires an AkibanDB engine.
-         *
-         * @return whether this enum is one that requires AkibanDB
-         */
-        public boolean isAkiban()
-        {
-            return (this == AKIBAN_STANDARD) || (this == AKIBAN_LOOKUP_TABLE);
-        }
-
-        /**
-         * <p>Returns whether this usage requires that the table participate in grouping.</p>
-         * <p/>
-         * <p>Tables participate in grouping if they're AkibanDB (see {@linkplain #isAkiban()} <em>and</em>
-         * are not lookups.</p>
-         *
-         * @return
-         */
-        public boolean includeInGrouping()
-        {
-            return this == AKIBAN_STANDARD;
-        }
-    }
-
-    /**
-     * @deprecated - use AkibanInfomationSchema#validate() instead
-     * @param out
-     */
-    public void checkIntegrity(List<String> out)
-    {
-        if (tableName == null) {
-            out.add("table had null table name");
-        }
-        for (Map.Entry<String, Column> entry : columnMap.entrySet()) {
-            String name = entry.getKey();
-            Column column = entry.getValue();
-            if (column == null) {
-                out.add("null column for name: " + name);
-            } else if (name == null) {
-                out.add("null name for column: " + column);
-            } else if (!name.equals(column.getName())) {
-                out.add("name mismatch, expected <" + name + "> for column " + column);
-            }
-        }
-        if (!columnsStale) {
-            for (Column column : columns) {
-                if (column == null) {
-                    out.add("null column in columns list");
-                } else if (!columnMap.containsKey(column.getName())) {
-                    out.add("columns not stale, but map didn't contain column: " + column.getName());
-                }
-            }
-        }
-        for (Map.Entry<String, TableIndex> entry : indexMap.entrySet()) {
-            String name = entry.getKey();
-            TableIndex index = entry.getValue();
-            if (name == null) {
-                out.add("null name for index: " + index);
-            } else if (index == null) {
-                out.add("null index for name: " + name);
-            } else if (index.getTable() != this) {
-                out.add("table's index.getTable() wasn't the table" + index + " <--> " + this);
-            }
-            if (index != null) {
-                for (IndexColumn indexColumn : index.getKeyColumns()) {
-                    if (!index.equals(indexColumn.getIndex())) {
-                        out.add("index's indexColumn.getIndex() wasn't index: " + indexColumn);
-                    }
-                    Column column = indexColumn.getColumn();
-                    if (!columnMap.containsKey(column.getName())) {
-                        out.add("index referenced a column not in the table: " + column);
-                    }
-                }
-            }
-        }
-    }
-
-    public String getEngine()
-    {
-        return engine;
-    }
-
-    public void rowDef(RowDef rowDef)
-    {
-        this.rowDef = rowDef;
-    }
-
-    public RowDef rowDef()
-    {
-        return rowDef;
-    }
-
-    // State
-    private final Map<String, TableIndex> indexMap;
-    private final Map<String, TableIndex> unmodifiableIndexMap;
-    private final Collection<GroupIndex> groupIndexes;
-    private final Collection<GroupIndex> unmodifiableGroupIndexes;
-
-    protected Group group;
-    private Integer tableId;
-    protected MigrationUsage migrationUsage = MigrationUsage.AKIBAN_STANDARD;
-    protected String engine;
-    private RowDef rowDef;
-    private Integer ordinal;
-}

=== renamed file 'src/main/java/com/akiban/ais/model/UserTable.java' => 'src/main/java/com/akiban/ais/model/Table.java'
--- src/main/java/com/akiban/ais/model/UserTable.java	2013-05-20 14:18:40 +0000
+++ src/main/java/com/akiban/ais/model/Table.java	2013-05-28 23:28:27 +0000
@@ -18,51 +18,52 @@
 package com.akiban.ais.model;
 
 import com.akiban.qp.memoryadapter.MemoryTableFactory;
+import com.akiban.server.rowdata.RowDef;
 import com.akiban.util.ArgumentValidation;
 
 import java.util.*;
 
-public class UserTable extends Table
+public class Table extends Columnar implements Traversable, HasGroup
 {
-    public static UserTable create(AkibanInformationSchema ais,
+    public static Table create(AkibanInformationSchema ais,
                                    String schemaName,
                                    String tableName,
                                    Integer tableId)
     {
-        UserTable userTable = new UserTable(ais, schemaName, tableName, tableId);
-        ais.addUserTable(userTable);
-        return userTable;
+        Table table = new Table(ais, schemaName, tableName, tableId);
+        ais.addTable(table);
+        return table;
     }
 
     /**
-     * Create an independent copy of an existing UserTable.
+     * Create an independent copy of an existing Table.
      * @param ais Destination AkibanInformationSchema.
-     * @param userTable UserTable to copy.
-     * @return The new copy of the UserTable.
+     * @param table Table to copy.
+     * @return The new copy of the Table.
      */
-    public static UserTable create(AkibanInformationSchema ais, UserTable userTable) {
-        UserTable copy = create(ais, userTable.tableName.getSchemaName(), userTable.tableName.getTableName(), userTable.getTableId());
-        copy.setUuid(userTable.getUuid());
+    public static Table create(AkibanInformationSchema ais, Table table) {
+        Table copy = create(ais, table.tableName.getSchemaName(), table.tableName.getTableName(), table.getTableId());
+        copy.setUuid(table.getUuid());
         return copy;
     }
 
-    private UserTable(AkibanInformationSchema ais, String schemaName, String tableName, Integer tableId)
+    private Table(AkibanInformationSchema ais, String schemaName, String tableName, Integer tableId)
     {
-        super(ais, schemaName, tableName, tableId);
+        super(ais, schemaName, tableName);
+        this.tableId = tableId;
+
+        this.groupIndexes = new HashSet<>();
+        this.unmodifiableGroupIndexes = Collections.unmodifiableCollection(groupIndexes);
+        this.indexMap = new TreeMap<>();
+        this.unmodifiableIndexMap = Collections.unmodifiableMap(indexMap);
+
         this.fullTextIndexes = new HashSet<>();
         this.unmodifiableFullTextIndexes = Collections.unmodifiableCollection(fullTextIndexes);
     }
 
-    @Override
-    public boolean isUserTable()
-    {
-        return true;
-    }
-
-    @Override
     protected void addIndex(TableIndex index)
     {
-        super.addIndex(index);
+        indexMap.put(index.getIndexName().getName().toLowerCase(), index);
         if (index.isPrimaryKey()) {
             assert primaryKey == null;
             primaryKey = new PrimaryKey(index);
@@ -75,12 +76,11 @@
         super.dropColumns();
     }
 
-    @Override
     public void removeIndexes(Collection<TableIndex> indexesToDrop) {
         if((primaryKey != null) && indexesToDrop.contains(primaryKey.getIndex())) {
             primaryKey = null;
         }
-        super.removeIndexes(indexesToDrop);
+        indexMap.values().removeAll(indexesToDrop);
     }
     
     /**
@@ -105,7 +105,7 @@
 
     private void findMatchingAncestorColumns(Column fromColumn, List<Column> matchingColumns)
     {
-        Join join = ((UserTable)fromColumn.getTable()).getParentJoin();
+        Join join = fromColumn.getTable().getParentJoin();
         if (join != null) {
             JoinColumn ancestorJoinColumn = null;
             for (JoinColumn joinColumn : join.getJoinColumns()) {
@@ -222,19 +222,17 @@
         return identity;
     }
 
-    @Override
     public Collection<TableIndex> getIndexes()
     {
-        Collection<TableIndex> indexes = super.getIndexes();
+        Collection<TableIndex> indexes = getIndexesIncludingInternal();
         return removeInternalColumnIndexes(indexes);
     }
 
     public Collection<TableIndex> getIndexesIncludingInternal()
     {
-        return super.getIndexes();
+        return unmodifiableIndexMap.values();
     }
 
-    @Override
     public TableIndex getIndex(String indexName)
     {
         TableIndex index = null;
@@ -243,16 +241,16 @@
             PrimaryKey primaryKey = getPrimaryKey();
             index = primaryKey == null ? null : primaryKey.getIndex();
         } else {
-            index = super.getIndex(indexName);
+            index = unmodifiableIndexMap.get(indexName.toLowerCase());
         }
         return index;
     }
 
-    public boolean isDescendantOf(UserTable other) {
+    public boolean isDescendantOf(Table other) {
         if (getGroup() == null || !getGroup().equals(other.getGroup())) {
             return false;
         }
-        UserTable possibleDescendant = this;
+        Table possibleDescendant = this;
         while (possibleDescendant != null) {
             if (possibleDescendant.equals(other)) {
                 return true;
@@ -264,7 +262,7 @@
 
     public Index getIndexIncludingInternal(String indexName)
     {
-        return super.getIndex(indexName);
+        return unmodifiableIndexMap.get(indexName.toLowerCase());
     }
 
     @Override
@@ -292,19 +290,19 @@
     }
 
     public void traverseTableAndDescendants(Visitor visitor) {
-        List<UserTable> remainingTables = new ArrayList<>();
+        List<Table> remainingTables = new ArrayList<>();
         List<Join> remainingJoins = new ArrayList<>();
         remainingTables.add(this);
         remainingJoins.addAll(getCandidateChildJoins());
         // Add before visit in-case visitor changes group or joins
         while(!remainingJoins.isEmpty()) {
             Join join = remainingJoins.remove(remainingJoins.size() - 1);
-            UserTable child = join.getChild();
+            Table child = join.getChild();
             remainingTables.add(child);
             remainingJoins.addAll(child.getCandidateChildJoins());
         }
-        for(UserTable table : remainingTables) {
-            visitor.visitUserTable(table);
+        for(Table table : remainingTables) {
+            visitor.visitTable(table);
         }
     }
 
@@ -369,7 +367,7 @@
         }
 
         // put the child tables into their ordered list.
-        TreeMap<String, UserTable> childTables = new TreeMap<String, UserTable>();
+        TreeMap<String,Table> childTables = new TreeMap<String,Table>();
         for (Join childJoin : candidateChildJoins ) {
             String childName;
             if (childJoin.getChild().getName().getSchemaName().equals(getName().getSchemaName())) {
@@ -418,23 +416,6 @@
         return getGroup() == null || getParentJoin() == null;
     }
 
-    public MigrationUsage getMigrationUsage()
-    {
-        return migrationUsage;
-    }
-
-    public void setMigrationUsage(MigrationUsage migrationUsage)
-    {
-        assert (this.migrationUsage != MigrationUsage.INCOMPATIBLE || migrationUsage == MigrationUsage.INCOMPATIBLE)
-            : "cannot change migration usage from INCOMPATIBLE to " + migrationUsage;
-        this.migrationUsage = migrationUsage;
-    }
-
-    public void setEngine(String engine)
-    {
-        this.engine = engine;
-    }
-
     public HKey hKey()
     {
         assert getGroup() != null;
@@ -466,7 +447,7 @@
         return containsOwnHKey;
     }
 
-    public UserTable parentTable()
+    public Table parentTable()
     {
         Join join = getParentJoin();
         return join == null ? null : join.getParent();
@@ -481,14 +462,14 @@
     }
 
     // Descendent tables whose hkeys are affected by a change to this table's PK or FK.
-    public List<UserTable> hKeyDependentTables()
+    public List<Table> hKeyDependentTables()
     {
         if (hKeyDependentTables == null) {
             synchronized (lazyEvaluationLock) {
                 if (hKeyDependentTables == null) {
                     hKeyDependentTables = new ArrayList<>();
                     for (Join join : getChildJoins()) {
-                        UserTable child = join.getChild();
+                        Table child = join.getChild();
                         if (!child.containsOwnHKey()) {
                             addTableAndDescendents(child, hKeyDependentTables);
                         }
@@ -532,7 +513,7 @@
         return nameForOutput;
     }
     
-    private void addTableAndDescendents(UserTable table, List<UserTable> accumulator)
+    private void addTableAndDescendents(Table table, List<Table> accumulator)
     {
         accumulator.add(table);
         for (Join join : table.getChildJoins()) {
@@ -648,32 +629,158 @@
         return null;
     }
 
+    @Override
+    public boolean isView() {
+        return false;
+    }
+
+    public Integer getTableId()
+    {
+        return tableId;
+    }
+
+    public void setTableId(final int tableId)
+    {
+        this.tableId = tableId;
+    }
+
+    public Integer getOrdinal()
+    {
+        return ordinal;
+    }
+
+    public void setOrdinal(Integer ordinal)
+    {
+        this.ordinal = ordinal;
+    }
+
+    public Group getGroup()
+    {
+        return group;
+    }
+
+    public void setGroup(Group group)
+    {
+        this.group = group;
+    }
+
+    /**
+     * Get all GroupIndexes this table participates in, both explicit and implicit (i.e. as a declared column or
+     * as an ancestor of a declared column
+     */
+    public final Collection<GroupIndex> getGroupIndexes() {
+        return unmodifiableGroupIndexes;
+    }
+
+    void clearIndexes() {
+        indexMap.clear();
+    }
+
+    final void addGroupIndex(GroupIndex groupIndex) {
+        groupIndexes.add(groupIndex);
+    }
+
+    final void removeGroupIndex(GroupIndex groupIndex) {
+        groupIndexes.remove(groupIndex);
+    }
+
+    /**
+     * @deprecated - use AkibanInfomationSchema#validate() instead
+     * @param out
+     */
+    public void checkIntegrity(List<String> out)
+    {
+        if (tableName == null) {
+            out.add("table had null table name");
+        }
+        for (Map.Entry<String, Column> entry : columnMap.entrySet()) {
+            String name = entry.getKey();
+            Column column = entry.getValue();
+            if (column == null) {
+                out.add("null column for name: " + name);
+            } else if (name == null) {
+                out.add("null name for column: " + column);
+            } else if (!name.equals(column.getName())) {
+                out.add("name mismatch, expected <" + name + "> for column " + column);
+            }
+        }
+        if (!columnsStale) {
+            for (Column column : columns) {
+                if (column == null) {
+                    out.add("null column in columns list");
+                } else if (!columnMap.containsKey(column.getName())) {
+                    out.add("columns not stale, but map didn't contain column: " + column.getName());
+                }
+            }
+        }
+        for (Map.Entry<String, TableIndex> entry : indexMap.entrySet()) {
+            String name = entry.getKey();
+            TableIndex index = entry.getValue();
+            if (name == null) {
+                out.add("null name for index: " + index);
+            } else if (index == null) {
+                out.add("null index for name: " + name);
+            } else if (index.getTable() != this) {
+                out.add("table's index.getTable() wasn't the table" + index + " <--> " + this);
+            }
+            if (index != null) {
+                for (IndexColumn indexColumn : index.getKeyColumns()) {
+                    if (!index.equals(indexColumn.getIndex())) {
+                        out.add("index's indexColumn.getIndex() wasn't index: " + indexColumn);
+                    }
+                    Column column = indexColumn.getColumn();
+                    if (!columnMap.containsKey(column.getName())) {
+                        out.add("index referenced a column not in the table: " + column);
+                    }
+                }
+            }
+        }
+    }
+
+    public void rowDef(RowDef rowDef)
+    {
+        this.rowDef = rowDef;
+    }
+
+    public RowDef rowDef()
+    {
+        return rowDef;
+    }
+
+
     // State
-
+    private final Map<String, TableIndex> indexMap;
+    private final Map<String, TableIndex> unmodifiableIndexMap;
+    private final Collection<GroupIndex> groupIndexes;
+    private final Collection<GroupIndex> unmodifiableGroupIndexes;
     private final List<Join> candidateParentJoins = new ArrayList<>();
     private final List<Join> candidateChildJoins = new ArrayList<>();
     private final Object lazyEvaluationLock = new Object();
 
+    private Group group;
+    private Integer tableId;
+    private RowDef rowDef;
+    private Integer ordinal;
     private UUID uuid;
     private PrimaryKey primaryKey;
     private HKey hKey;
     private boolean containsOwnHKey;
     private List<Column> allHKeyColumns;
     private Integer depth = null;
-    private volatile List<UserTable> hKeyDependentTables;
+    private volatile List<Table> hKeyDependentTables;
     private MemoryTableFactory tableFactory;
     private Integer version;
     private PendingOSC pendingOSC;
     private final Collection<FullTextIndex> fullTextIndexes;
     private final Collection<FullTextIndex> unmodifiableFullTextIndexes;
     private String nameForOutput;
-    
+
     // consts
 
     private static final Comparator<Column> COLUMNS_BY_TABLE_DEPTH = new Comparator<Column>() {
         @Override
         public int compare(Column o1, Column o2) {
-            return o1.getUserTable().getDepth() - o2.getUserTable().getDepth();
+            return o1.getTable().getDepth() - o2.getTable().getDepth();
         }
     };
 }

=== modified file 'src/main/java/com/akiban/ais/model/TableIndex.java'
--- src/main/java/com/akiban/ais/model/TableIndex.java	2013-05-24 21:45:54 +0000
+++ src/main/java/com/akiban/ais/model/TableIndex.java	2013-05-28 23:28:27 +0000
@@ -108,7 +108,6 @@
                     if (table.getColumnsIncludingInternal().contains(column)) {
                         toIndexRowBuilder.rowCompEntry(column.getPosition(), -1);
                     } else {
-                        assert hKeySegment.table().isUserTable() : this;
                         toIndexRowBuilder.rowCompEntry(-1, hKeyColumn.positionInHKey());
                     }
                     indexColumns.add(column);
@@ -169,14 +168,12 @@
         return uniqueAndMayContainNulls;
     }
 
-    // For a user table index: the user table hkey
-    // For a group table index: the hkey of the leafmost user table, but with user table columns replaced by
-    // group table columns.
+    // For a table index: the table hkey
     @Override
     public HKey hKey()
     {
         if (hKey == null) {
-            hKey = ((UserTable) table).hKey();
+            hKey = table.hKey();
         }
         return hKey;
     }

=== modified file 'src/main/java/com/akiban/ais/model/Visitor.java'
--- src/main/java/com/akiban/ais/model/Visitor.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/Visitor.java	2013-05-28 23:28:27 +0000
@@ -21,7 +21,7 @@
 {
     void visitType(Type type);
     void visitGroup(Group group);
-    void visitUserTable(UserTable userTable);
+    void visitTable(Table table);
     void visitColumn(Column column);
     void visitJoin(Join join) ;
     void visitJoinColumn(JoinColumn joinColumn);

=== modified file 'src/main/java/com/akiban/ais/model/aisb2/AISBBasedBuilder.java'
--- src/main/java/com/akiban/ais/model/aisb2/AISBBasedBuilder.java	2013-04-12 21:41:19 +0000
+++ src/main/java/com/akiban/ais/model/aisb2/AISBBasedBuilder.java	2013-05-28 23:28:27 +0000
@@ -24,7 +24,7 @@
 import com.akiban.ais.model.Parameter;
 import com.akiban.ais.model.Routine;
 import com.akiban.ais.model.TableName;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.ais.model.View;
 import com.akiban.ais.model.validation.AISInvariants;
 import com.akiban.ais.model.validation.AISValidationResults;
@@ -90,18 +90,18 @@
         }
 
         @Override
-        public NewUserTableBuilder userTable(String table) {
-            return userTable(defaultSchema, table);
+        public NewTableBuilder table(String table) {
+            return table(defaultSchema, table);
         }
 
         @Override
-        public NewUserTableBuilder userTable(String schema, String table) {
+        public NewTableBuilder table(String schema, String table) {
             checkUsable();
             AISInvariants.checkDuplicateTables(aisb.akibanInformationSchema(), schema, table);
             this.schema = schema;
-            this.userTable = table;
+            this.table = table;
             TableName tableName= new TableName (schema, table);
-            aisb.userTable(schema, table);
+            aisb.table(schema, table);
             aisb.createGroup(table, schema);
             aisb.addTableToGroup(tableName, schema, table);
             tablesToGroups.put(TableName.create(schema, table), tableName);
@@ -110,15 +110,15 @@
         }
 
         @Override
-        public NewUserTableBuilder getUserTable() {
+        public NewTableBuilder getTable() {
             return this;
         }
         
         @Override 
-        public NewUserTableBuilder getUserTable(TableName table) {
+        public NewTableBuilder getTable(TableName table) {
             checkUsable();
             this.schema = table.getSchemaName();
-            this.userTable = table.getTableName();
+            this.table = table.getTableName();
             assert aisb.akibanInformationSchema().getTable(table) != null;
             uTableColumnPos = aisb.akibanInformationSchema().getTable(table).getColumns().size();
             return this;
@@ -138,8 +138,8 @@
         }
 
         @Override
-        public NewUserTableBuilder userTable(TableName tableName) {
-            return userTable(tableName.getSchemaName(), tableName.getTableName());
+        public NewTableBuilder table(TableName tableName) {
+            return table(tableName.getSchemaName(), tableName.getTableName());
         }
 
         @Override
@@ -152,7 +152,7 @@
             checkUsable();
             AISInvariants.checkDuplicateTables(aisb.akibanInformationSchema(), schema, view);
             this.schema = schema;
-            this.userTable = view;
+            this.table = view;
             return this;
         }
 
@@ -171,7 +171,7 @@
             checkUsable();
             AISInvariants.checkDuplicateRoutine(aisb.akibanInformationSchema(), schema, procedure);
             this.schema = schema;
-            this.userTable = procedure;
+            this.table = procedure;
             return this;
         }
 
@@ -190,7 +190,7 @@
             checkUsable();
             AISInvariants.checkDuplicateSQLJJar(aisb.akibanInformationSchema(), schema, jarName);
             this.schema = schema;
-            this.userTable = jarName;
+            this.table = jarName;
             return this;
         }
 
@@ -210,41 +210,41 @@
             return actual.groupIndex(indexName, joinType);
         }
 
-        // NewUserTableBuilder interface
+        // NewTableBuilder interface
 
         @Override
-        public NewUserTableBuilder colLong(String name) {
+        public NewTableBuilder colLong(String name) {
             return colLong(name, NULLABLE_DEFAULT, null, null);
         }
 
         @Override
-        public NewUserTableBuilder colLong(String name, boolean nullable) {
+        public NewTableBuilder colLong(String name, boolean nullable) {
             return colLong(name, nullable, null, null);
         }
 
         @Override
-        public NewUserTableBuilder autoIncLong(String name, int initialValue) {
+        public NewTableBuilder autoIncLong(String name, int initialValue) {
             return colLong(name, false, initialValue, true);
         }
 
         @Override
-        public NewUserTableBuilder autoIncLong(String name, int initialValue, boolean always) {
+        public NewTableBuilder autoIncLong(String name, int initialValue, boolean always) {
             return colLong(name, false, initialValue, !always);
         }
 
-        private NewUserTableBuilder colLong(String name, boolean nullable, Integer initialAutoInc, Boolean defaultIdentity) {
+        private NewTableBuilder colLong(String name, boolean nullable, Integer initialAutoInc, Boolean defaultIdentity) {
             checkUsable();
-            aisb.column(schema, userTable, name, uTableColumnPos++, "INT", 10L, null, nullable, false, null, null);
+            aisb.column(schema, table, name, uTableColumnPos++, "INT", 10L, null, nullable, false, null, null);
             if (initialAutoInc != null) {
                 assert defaultIdentity != null;
-                String sequenceName = "temp-seq-" + userTable + "-" + name;
+                String sequenceName = "temp-seq-" + table + "-" + name;
                 long initValue = initialAutoInc.longValue();
                 aisb.sequence(schema, sequenceName, 
                               initValue, 1L, initValue, Long.MAX_VALUE,
                               false);
-                aisb.columnAsIdentity(schema, userTable, name, sequenceName, defaultIdentity);
+                aisb.columnAsIdentity(schema, table, name, sequenceName, defaultIdentity);
                 aisb.akibanInformationSchema().
-                     getUserTable(schema, userTable).
+                        getTable(schema, table).
                      getColumn(name).
                      setInitialAutoIncrementValue(initValue);
             }
@@ -252,117 +252,119 @@
         }
 
         @Override
-        public NewUserTableBuilder colBoolean(String name, boolean nullable) {
+        public NewTableBuilder colBoolean(String name, boolean nullable) {
             checkUsable();
-            aisb.column(schema, userTable, name, uTableColumnPos++, "BOOLEAN", null, null, nullable, false, null, null);
+            aisb.column(schema, table, name, uTableColumnPos++, "BOOLEAN", null, null, nullable, false, null, null);
             return this;
         }
 
         @Override
-        public NewUserTableBuilder colString(String name, int length) {
+        public NewTableBuilder colString(String name, int length) {
             return colString(name, length, NULLABLE_DEFAULT);
         }
 
         @Override
-        public NewUserTableBuilder colString(String name, int length, boolean nullable) {
+        public NewTableBuilder colString(String name, int length, boolean nullable) {
             return colString(name, length, nullable, CHARSET_DEFAULT);
         }
 
         @Override
-        public NewUserTableBuilder colString(String name, int length, boolean nullable, String charset) {
+        public NewTableBuilder colString(String name, int length, boolean nullable, String charset) {
             checkUsable();
-            aisb.column(schema, userTable, name, uTableColumnPos++, "VARCHAR", (long)length, null, nullable, false, charset, null);
+            aisb.column(schema,
+                        table, name, uTableColumnPos++, "VARCHAR", (long)length, null, nullable, false, charset, null);
             return this;
         }
 
         @Override
-        public NewUserTableBuilder colDouble(String name) {
+        public NewTableBuilder colDouble(String name) {
             return colDouble(name, NULLABLE_DEFAULT);
         }
 
         @Override
-        public NewUserTableBuilder colDouble(String name, boolean nullable) {
+        public NewTableBuilder colDouble(String name, boolean nullable) {
             checkUsable();
-            aisb.column(schema, userTable, name, uTableColumnPos++, "DOUBLE", null, null, nullable, false, null, null);
+            aisb.column(schema, table, name, uTableColumnPos++, "DOUBLE", null, null, nullable, false, null, null);
             return this;
         }
 
         @Override
-        public NewUserTableBuilder colTimestamp(String name) {
+        public NewTableBuilder colTimestamp(String name) {
             return colTimestamp(name, NULLABLE_DEFAULT);
         }
 
         @Override
-        public NewUserTableBuilder colTimestamp(String name, boolean nullable) {
-            aisb.column(schema, userTable, name, uTableColumnPos++, "TIMESTAMP", null, null, nullable, false, null, null);
+        public NewTableBuilder colTimestamp(String name, boolean nullable) {
+            aisb.column(schema, table, name, uTableColumnPos++, "TIMESTAMP", null, null, nullable, false, null, null);
             return this;
         }
 
         @Override
-        public NewUserTableBuilder colBigInt(String name) {
+        public NewTableBuilder colBigInt(String name) {
             return colBigInt(name, NULLABLE_DEFAULT);
         }
 
         @Override
-        public NewUserTableBuilder colBigInt(String name, boolean nullable) {
-            aisb.column(schema, userTable, name, uTableColumnPos++, "BIGINT", null, null, nullable, false, null, null);
+        public NewTableBuilder colBigInt(String name, boolean nullable) {
+            aisb.column(schema, table, name, uTableColumnPos++, "BIGINT", null, null, nullable, false, null, null);
             return this;
         }
 
         @Override
-        public NewUserTableBuilder colVarBinary(String name, int length) {
+        public NewTableBuilder colVarBinary(String name, int length) {
             return colVarBinary(name, length, NULLABLE_DEFAULT);
         }
 
         @Override
-        public NewUserTableBuilder colVarBinary(String name, int length, boolean nullable) {
-            aisb.column(schema, userTable, name, uTableColumnPos++, "VARBINARY", (long)length, null, nullable, false, null, null);
+        public NewTableBuilder colVarBinary(String name, int length, boolean nullable) {
+            aisb.column(schema,
+                        table, name, uTableColumnPos++, "VARBINARY", (long)length, null, nullable, false, null, null);
             return this;
         }
 
         @Override
-        public NewUserTableBuilder colText(String name) {
+        public NewTableBuilder colText(String name) {
             return colText(name, NULLABLE_DEFAULT);
         }
 
         @Override
-        public NewUserTableBuilder colText(String name, boolean nullable) {
-            aisb.column(schema, userTable, name, uTableColumnPos++, "TEXT", null, null, nullable, false, null, null);
+        public NewTableBuilder colText(String name, boolean nullable) {
+            aisb.column(schema, table, name, uTableColumnPos++, "TEXT", null, null, nullable, false, null, null);
             return this;
         }
         
         @Override
-        public NewUserTableBuilder colDateTime (String name) {
+        public NewTableBuilder colDateTime (String name) {
             return colDateTime(name, NULLABLE_DEFAULT);
         }
         
         @Override
-        public NewUserTableBuilder colDateTime (String name, boolean nullable) {
-            aisb.column(schema, userTable, name, uTableColumnPos++, "DATETIME", null, null, nullable, false, null, null);
+        public NewTableBuilder colDateTime (String name, boolean nullable) {
+            aisb.column(schema, table, name, uTableColumnPos++, "DATETIME", null, null, nullable, false, null, null);
             return this;
         }
 
 
         @Override
-        public NewUserTableBuilder pk(String... columns) {
+        public NewTableBuilder pk(String... columns) {
             return key(PRIMARY, columns, true, Index.PRIMARY_KEY_CONSTRAINT);
         }
 
         @Override
-        public NewUserTableBuilder uniqueKey(String indexName, String... columns) {
+        public NewTableBuilder uniqueKey(String indexName, String... columns) {
             return key(indexName, columns, true, Index.UNIQUE_KEY_CONSTRAINT);
         }
 
         @Override
-        public NewUserTableBuilder key(String indexName, String... columns) {
+        public NewTableBuilder key(String indexName, String... columns) {
             return key(indexName, columns, false, Index.KEY_CONSTRAINT);
         }
 
-        private NewUserTableBuilder key(String indexName, String[] columns, boolean unique, String constraint) {
+        private NewTableBuilder key(String indexName, String[] columns, boolean unique, String constraint) {
             checkUsable();
-            aisb.index(schema, userTable, indexName, unique, constraint);
+            aisb.index(schema, table, indexName, unique, constraint);
             for (int i=0; i < columns.length; ++i) {
-                aisb.indexColumn(schema, userTable, indexName, columns[i], i, true, null);
+                aisb.indexColumn(schema, table, indexName, columns[i], i, true, null);
             }
             return this;
         }
@@ -379,7 +381,7 @@
 
         @Override
         public NewAkibanJoinBuilder joinTo(String schema, String table) {
-            String generated = "autogenerated_"+userTable+"_references_" + table;
+            String generated = "autogenerated_"+ this.table +"_references_" + table;
             return joinTo(schema, table, generated);
         }
 
@@ -392,15 +394,15 @@
             this.referencesSchema = schema;
             this.referencesTable = table;
 
-            Group oldGroup = aisb.akibanInformationSchema().getUserTable(this.schema, this.userTable).getGroup();
+            Group oldGroup = aisb.akibanInformationSchema().getTable(this.schema, this.table).getGroup();
 
-            aisb.index(this.schema, this.userTable, fkIndexName, false, Index.FOREIGN_KEY_CONSTRAINT);
-            aisb.joinTables(fkJoinName, schema, table, this.schema, this.userTable);
+            aisb.index(this.schema, this.table, fkIndexName, false, Index.FOREIGN_KEY_CONSTRAINT);
+            aisb.joinTables(fkJoinName, schema, table, this.schema, this.table);
 
             TableName fkGroupName = tablesToGroups.get(TableName.create(referencesSchema, referencesTable));
-            aisb.moveTreeToGroup(this.schema, this.userTable, fkGroupName, fkJoinName);
+            aisb.moveTreeToGroup(this.schema, this.table, fkGroupName, fkJoinName);
             aisb.akibanInformationSchema().removeGroup(oldGroup);
-            TableName oldGroupName = tablesToGroups.put(TableName.create(this.schema, this.userTable), fkGroupName);
+            TableName oldGroupName = tablesToGroups.put(TableName.create(this.schema, this.table), fkGroupName);
             assert oldGroup.getName().equals(oldGroupName) : oldGroup.getName() + " != " + oldGroupName;
             return this;
         }
@@ -410,8 +412,8 @@
         @Override
         public NewAkibanJoinBuilder on(String childColumn, String parentColumn) {
             checkUsable();
-            aisb.indexColumn(schema, userTable, fkIndexName, childColumn, fkIndexPos, true, null);
-            aisb.joinColumns(fkJoinName, referencesSchema, referencesTable, parentColumn, schema, userTable, childColumn);
+            aisb.indexColumn(schema, table, fkIndexName, childColumn, fkIndexPos, true, null);
+            aisb.joinColumns(fkJoinName, referencesSchema, referencesTable, parentColumn, schema, table, childColumn);
             return this;
         }
 
@@ -431,7 +433,7 @@
 
         @Override
         public NewViewBuilder definition(String definition, Properties properties) {
-            aisb.view(schema, userTable,
+            aisb.view(schema, table,
                       definition, properties, 
                       new HashMap<TableName,Collection<String>>());
             return this;
@@ -445,7 +447,7 @@
         @Override
         public NewViewBuilder references(String schema, String table, String... columns) {
             checkUsable();
-            View view = aisb.akibanInformationSchema().getView(this.schema, this.userTable);
+            View view = aisb.akibanInformationSchema().getView(this.schema, this.table);
             TableName tableName = TableName.create(schema, table);
             Collection<String> entry = view.getTableColumnReferences().get(tableName);
             if (entry == null) {
@@ -462,43 +464,43 @@
 
         @Override
         public NewRoutineBuilder language(String language, Routine.CallingConvention callingConvention) {
-            aisb.routine(schema, userTable, language, callingConvention);
+            aisb.routine(schema, table, language, callingConvention);
             return this;
         }
     
         @Override
         public NewRoutineBuilder paramLongIn(String name) {
-            aisb.parameter(schema, userTable, name, Parameter.Direction.IN, "BIGINT", null, null);
+            aisb.parameter(schema, table, name, Parameter.Direction.IN, "BIGINT", null, null);
             return this;
         }
 
         @Override
         public NewRoutineBuilder paramStringIn(String name, int length) {
-            aisb.parameter(schema, userTable, name, Parameter.Direction.IN, "VARCHAR", (long)length, null);
+            aisb.parameter(schema, table, name, Parameter.Direction.IN, "VARCHAR", (long)length, null);
             return this;
         }
 
         @Override
         public NewRoutineBuilder paramDoubleIn(String name) {
-            aisb.parameter(schema, userTable, name, Parameter.Direction.IN, "DOUBLE", null, null);
+            aisb.parameter(schema, table, name, Parameter.Direction.IN, "DOUBLE", null, null);
             return this;
         }
 
         @Override
         public NewRoutineBuilder paramLongOut(String name) {
-            aisb.parameter(schema, userTable, name, Parameter.Direction.OUT, "BIGINT", null, null);
+            aisb.parameter(schema, table, name, Parameter.Direction.OUT, "BIGINT", null, null);
             return this;
         }
 
         @Override
         public NewRoutineBuilder paramStringOut(String name, int length) {
-            aisb.parameter(schema, userTable, name, Parameter.Direction.OUT, "VARCHAR", (long)length, null);
+            aisb.parameter(schema, table, name, Parameter.Direction.OUT, "VARCHAR", (long)length, null);
             return this;
         }
 
         @Override
         public NewRoutineBuilder paramDoubleOut(String name) {
-            aisb.parameter(schema, userTable, name, Parameter.Direction.OUT, "DOUBLE", null, null);
+            aisb.parameter(schema, table, name, Parameter.Direction.OUT, "DOUBLE", null, null);
             return this;
         }
 
@@ -521,7 +523,7 @@
         @Override
         public NewRoutineBuilder externalName(String jarSchema, String jarName, 
                                               String className, String methodName) {
-            aisb.routineExternalName(schema, userTable, 
+            aisb.routineExternalName(schema, table,
                                      jarSchema, jarName, 
                                      className, methodName);
             return this;
@@ -529,31 +531,31 @@
 
         @Override
         public NewRoutineBuilder procDef(String definition) {
-            aisb.routineDefinition(schema, userTable, definition);
+            aisb.routineDefinition(schema, table, definition);
             return this;
         }
 
         @Override
         public NewRoutineBuilder sqlAllowed(Routine.SQLAllowed sqlAllowed) {
-            aisb.routineSQLAllowed(schema, userTable, sqlAllowed);
+            aisb.routineSQLAllowed(schema, table, sqlAllowed);
             return this;
         }
 
         @Override
         public NewRoutineBuilder dynamicResultSets(int dynamicResultSets) {
-            aisb.routineDynamicResultSets(schema, userTable, dynamicResultSets);
+            aisb.routineDynamicResultSets(schema, table, dynamicResultSets);
             return this;
         }
 
         @Override
         public NewRoutineBuilder deterministic(boolean deterministic) {
-            aisb.routineDeterministic(schema, userTable, deterministic);
+            aisb.routineDeterministic(schema, table, deterministic);
             return this;
         }
 
         @Override
         public NewRoutineBuilder calledOnNullInput(boolean calledOnNullInput) {
-            aisb.routineCalledOnNullInput(schema, userTable, calledOnNullInput);
+            aisb.routineCalledOnNullInput(schema, table, calledOnNullInput);
             return this;
         }
 
@@ -572,7 +574,7 @@
                 }
                 catch (MalformedURLException ex2) {
                     // Report original failure.
-                    throw new InvalidSQLJJarURLException(schema, userTable, ex1);
+                    throw new InvalidSQLJJarURLException(schema, table, ex1);
                 }
                 if (checkReadable && file.canRead())
                     checkReadable = false; // Can tell quickly.
@@ -583,7 +585,7 @@
                     istr = url.openStream(); // Must be able to load it.
                 }
                 catch (IOException ex) {
-                    throw new InvalidSQLJJarURLException(schema, userTable, ex);
+                    throw new InvalidSQLJJarURLException(schema, table, ex);
                 }
                 finally {
                     if (istr != null) {
@@ -595,7 +597,7 @@
                     }
                 }
             }
-            aisb.sqljJar(schema, userTable, url);
+            aisb.sqljJar(schema, table, url);
             return this;
         }
 
@@ -620,7 +622,7 @@
         private final AISBuilder aisb;
         private String defaultSchema;
         private String schema;
-        private String userTable;
+        private String table;
 
         private int uTableColumnPos;
 
@@ -684,7 +686,7 @@
 
         @Override
         public NewAISGroupIndexBuilder on(String schema, String table, String column) {
-            UserTable userTable = aisb.akibanInformationSchema().getUserTable(schema, table);
+            Table userTable = aisb.akibanInformationSchema().getTable(schema, table);
             if (userTable == null) {
                 throw new NoSuchElementException("no table " + schema + '.' + table);
             }

=== modified file 'src/main/java/com/akiban/ais/model/aisb2/NewAISBuilder.java'
--- src/main/java/com/akiban/ais/model/aisb2/NewAISBuilder.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/aisb2/NewAISBuilder.java	2013-05-28 23:28:27 +0000
@@ -32,7 +32,7 @@
      * @param table the table's name
      * @return the new table's builder
      */
-    NewUserTableBuilder userTable(String table);
+    NewTableBuilder table(String table);
 
     /**
      * Starts creating a new table using the given schema
@@ -40,16 +40,16 @@
      * @param table the new table's table name
      * @return the new table's builder
      */
-    NewUserTableBuilder userTable(String schema, String table);
+    NewTableBuilder table(String schema, String table);
 
-    NewUserTableBuilder userTable(TableName tableName);
+    NewTableBuilder table(TableName tableName);
     
     /**
-     * Returns the NewUserTableBuilder for the table being built 
+     * Returns the NewTableBuilder for the table being built
      * @return
      */
-    NewUserTableBuilder getUserTable();
-    NewUserTableBuilder getUserTable(TableName table);
+    NewTableBuilder getTable();
+    NewTableBuilder getTable(TableName table);
    
     /**
      * create a new sequence

=== modified file 'src/main/java/com/akiban/ais/model/aisb2/NewAkibanJoinBuilder.java'
--- src/main/java/com/akiban/ais/model/aisb2/NewAkibanJoinBuilder.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/aisb2/NewAkibanJoinBuilder.java	2013-05-28 23:28:27 +0000
@@ -17,7 +17,7 @@
 
 package com.akiban.ais.model.aisb2;
 
-public interface NewAkibanJoinBuilder extends NewUserTableBuilder {
+public interface NewAkibanJoinBuilder extends NewTableBuilder {
     /**
      * Adds a child -&gt; parent column pair to this join.
      *

=== renamed file 'src/main/java/com/akiban/ais/model/aisb2/NewUserTableBuilder.java' => 'src/main/java/com/akiban/ais/model/aisb2/NewTableBuilder.java'
--- src/main/java/com/akiban/ais/model/aisb2/NewUserTableBuilder.java	2013-04-12 21:41:19 +0000
+++ src/main/java/com/akiban/ais/model/aisb2/NewTableBuilder.java	2013-05-28 23:28:27 +0000
@@ -19,7 +19,7 @@
 
 import com.akiban.ais.model.TableName;
 
-public interface NewUserTableBuilder extends NewAISBuilder {
+public interface NewTableBuilder extends NewAISBuilder {
     /**
      * Joins this table to another one, using the default schema
      * @param table the table to join to
@@ -56,7 +56,7 @@
      * @param name the column's name
      * @return this
      */
-    NewUserTableBuilder colLong(String name);
+    NewTableBuilder colLong(String name);
 
     /**
      * Adds an optionally nullable Long column
@@ -64,7 +64,7 @@
      * @param nullable whether the column is nullable
      * @return this
      */
-    NewUserTableBuilder colLong(String name, boolean nullable);
+    NewTableBuilder colLong(String name, boolean nullable);
 
     /**
      * Adds a non-nullable, sequence backed, auto-incrementing BY DEFAULT identity column
@@ -72,7 +72,7 @@
      * @param initialValue the START WITH value
      * @return this
      */
-    NewUserTableBuilder autoIncLong(String name, int initialValue);
+    NewTableBuilder autoIncLong(String name, int initialValue);
 
     /**
      * Adds a non-nullable, sequence backed, auto-incrementing identity column
@@ -81,7 +81,7 @@
      * @param always ALWAYS if <code>true</code>, otherwise DEFAULT
      * @return this
      */
-    NewUserTableBuilder autoIncLong(String name, int initialValue, boolean always);
+    NewTableBuilder autoIncLong(String name, int initialValue, boolean always);
 
     /**
      * Adds an optionally nullable boolean column
@@ -89,7 +89,7 @@
      * @param nullable whether the column is nullable
      * @return this
      */
-    NewUserTableBuilder colBoolean(String name, boolean nullable);
+    NewTableBuilder colBoolean(String name, boolean nullable);
 
     /**
      * Adds a non-nullable varchar with UTF-8 encoding
@@ -97,7 +97,7 @@
      * @param length the varchar's max length
      * @return this
      */
-    NewUserTableBuilder colString(String name, int length);
+    NewTableBuilder colString(String name, int length);
 
     /**
      * Adds an optionally nullable varchar with UTF-8 encoding
@@ -106,7 +106,7 @@
      * @param nullable whether the column is nullable
      * @return this
      */
-    NewUserTableBuilder colString(String name, int length, boolean nullable);
+    NewTableBuilder colString(String name, int length, boolean nullable);
 
     /**
      * Adds an optionally nullable varchar with a specified encoding
@@ -116,32 +116,32 @@
      * @param charset the column's encoding
      * @return this
      */
-    NewUserTableBuilder colString(String name, int length, boolean nullable, String charset);
-
-    NewUserTableBuilder colDouble(String name);
-    NewUserTableBuilder colDouble(String name, boolean nullable);
-    
-    NewUserTableBuilder colTimestamp(String name);
-    NewUserTableBuilder colTimestamp(String name, boolean nullable);
-
-    NewUserTableBuilder colBigInt(String name);
-    NewUserTableBuilder colBigInt(String name, boolean nullable);
-
-    NewUserTableBuilder colVarBinary(String name, int length);
-    NewUserTableBuilder colVarBinary(String name, int length, boolean nullable);
-    
-    NewUserTableBuilder colText(String name);
-    NewUserTableBuilder colText(String name, boolean nullable);
-    
-    NewUserTableBuilder colDateTime (String name);
-    NewUserTableBuilder colDateTime (String name, boolean nullable);
+    NewTableBuilder colString(String name, int length, boolean nullable, String charset);
+
+    NewTableBuilder colDouble(String name);
+    NewTableBuilder colDouble(String name, boolean nullable);
+    
+    NewTableBuilder colTimestamp(String name);
+    NewTableBuilder colTimestamp(String name, boolean nullable);
+
+    NewTableBuilder colBigInt(String name);
+    NewTableBuilder colBigInt(String name, boolean nullable);
+
+    NewTableBuilder colVarBinary(String name, int length);
+    NewTableBuilder colVarBinary(String name, int length, boolean nullable);
+    
+    NewTableBuilder colText(String name);
+    NewTableBuilder colText(String name, boolean nullable);
+    
+    NewTableBuilder colDateTime (String name);
+    NewTableBuilder colDateTime (String name, boolean nullable);
 
     /**
      * Adds a PK
      * @param columns the columns that are in the PK
      * @return this
      */
-    NewUserTableBuilder pk(String... columns);
+    NewTableBuilder pk(String... columns);
 
     /**
      * Adds a unique key
@@ -149,7 +149,7 @@
      * @param columns the columns in the key
      * @return this
      */
-    NewUserTableBuilder uniqueKey(String indexName, String... columns);
+    NewTableBuilder uniqueKey(String indexName, String... columns);
 
     /**
      * Adds a non-unique key
@@ -157,5 +157,5 @@
      * @param columns the columns in the key
      * @return this
      */
-    NewUserTableBuilder key(String indexName, String... columns);
+    NewTableBuilder key(String indexName, String... columns);
 }

=== modified file 'src/main/java/com/akiban/ais/model/aisb2/NewViewBuilder.java'
--- src/main/java/com/akiban/ais/model/aisb2/NewViewBuilder.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/aisb2/NewViewBuilder.java	2013-05-28 23:28:27 +0000
@@ -19,7 +19,7 @@
 
 import java.util.Properties;
 
-public interface NewViewBuilder extends NewUserTableBuilder {
+public interface NewViewBuilder extends NewTableBuilder {
     NewViewBuilder definition(String definition);
 
     NewViewBuilder definition(String definition, Properties properties);

=== modified file 'src/main/java/com/akiban/ais/model/staticgrouping/GroupsBuilder.java'
--- src/main/java/com/akiban/ais/model/staticgrouping/GroupsBuilder.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/staticgrouping/GroupsBuilder.java	2013-05-28 23:28:27 +0000
@@ -28,7 +28,7 @@
 import com.akiban.ais.model.Join;
 import com.akiban.ais.model.JoinColumn;
 import com.akiban.ais.model.TableName;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 
 public final class GroupsBuilder
 {
@@ -214,7 +214,7 @@
     public static Grouping fromAis(AkibanInformationSchema ais, String defaultSchema) {
         GroupsBuilder builder = new GroupsBuilder(defaultSchema);
 
-        for (UserTable uTable : ais.getUserTables().values()) {
+        for (Table uTable : ais.getTables().values()) {
             if (uTable.getGroup() == null) {
                 continue;
             }

=== modified file 'src/main/java/com/akiban/ais/model/validation/CharacterSetSupported.java'
--- src/main/java/com/akiban/ais/model/validation/CharacterSetSupported.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/CharacterSetSupported.java	2013-05-28 23:28:27 +0000
@@ -21,7 +21,7 @@
 
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.Column;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.error.UnsupportedCharsetException;
 
 /**
@@ -34,7 +34,7 @@
 
     @Override
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
-        for (UserTable table : ais.getUserTables().values()) {
+        for (Table table : ais.getTables().values()) {
             final String tableCharset = table.getCharsetAndCollation().charset(); 
             if (tableCharset != null && !Charset.isSupported(tableCharset)) {
                 output.reportFailure(new AISValidationFailure (

=== modified file 'src/main/java/com/akiban/ais/model/validation/CollationSupported.java'
--- src/main/java/com/akiban/ais/model/validation/CollationSupported.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/CollationSupported.java	2013-05-28 23:28:27 +0000
@@ -19,7 +19,7 @@
 
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.Column;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.collation.AkCollatorFactory;
 import com.akiban.server.collation.InvalidCollationException;
 import com.akiban.server.error.UnsupportedCollationException;
@@ -35,7 +35,7 @@
 
     @Override
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
-        for (UserTable table : ais.getUserTables().values()) {
+        for (Table table : ais.getTables().values()) {
             for (Column column : table.getColumnsIncludingInternal()) {
                 validateCollationByName(column.getCharsetAndCollation().collation(), table.getName().getSchemaName(),
                         table.getName().getTableName(), column.getName(), output);

=== modified file 'src/main/java/com/akiban/ais/model/validation/ColumnMaxAndPrefixSizesMatch.java'
--- src/main/java/com/akiban/ais/model/validation/ColumnMaxAndPrefixSizesMatch.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/ColumnMaxAndPrefixSizesMatch.java	2013-05-28 23:28:27 +0000
@@ -19,13 +19,13 @@
 
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.Column;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.error.ColumnSizeMismatchException;
 
 public class ColumnMaxAndPrefixSizesMatch implements AISValidation {
     @Override
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
-        for(UserTable table : ais.getUserTables().values()) {
+        for(Table table : ais.getTables().values()) {
             for(Column column : table.getColumnsIncludingInternal()) {
                 Long maxStorage = column.getMaxStorageSize();
                 Long computedMaxStorage = column.computeMaxStorageSize();

=== modified file 'src/main/java/com/akiban/ais/model/validation/ColumnPositionDense.java'
--- src/main/java/com/akiban/ais/model/validation/ColumnPositionDense.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/ColumnPositionDense.java	2013-05-28 23:28:27 +0000
@@ -25,7 +25,7 @@
 
     @Override
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
-        for (Table table : ais.getUserTables().values()) {
+        for (Table table : ais.getTables().values()) {
             checkTable (table, output);
         }
     }

=== modified file 'src/main/java/com/akiban/ais/model/validation/GroupSingleRoot.java'
--- src/main/java/com/akiban/ais/model/validation/GroupSingleRoot.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/GroupSingleRoot.java	2013-05-28 23:28:27 +0000
@@ -19,7 +19,7 @@
 
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.Group;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.error.GroupHasMultipleRootsException;
 
 class GroupSingleRoot implements AISValidation {
@@ -32,14 +32,14 @@
     }
     
     private void validateGroup (AkibanInformationSchema ais, Group group, AISValidationOutput output) {
-        UserTable root = null;
-        for (UserTable userTable : ais.getUserTables().values()) {
-            if (userTable.getGroup() == group && userTable.isRoot()) {
+        Table root = null;
+        for (Table table : ais.getTables().values()) {
+            if (table.getGroup() == group && table.isRoot()) {
                 if (root == null) {
-                    root = userTable;
+                    root = table;
                 } else {
                     output.reportFailure(new AISValidationFailure (
-                            new GroupHasMultipleRootsException(group.getName(), root.getName(), userTable.getName())));
+                            new GroupHasMultipleRootsException(group.getName(), root.getName(), table.getName())));
                 }
             }
         }

=== modified file 'src/main/java/com/akiban/ais/model/validation/GroupTreeNamesUnique.java'
--- src/main/java/com/akiban/ais/model/validation/GroupTreeNamesUnique.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/GroupTreeNamesUnique.java	2013-05-28 23:28:27 +0000
@@ -19,7 +19,7 @@
 
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.Group;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.error.DuplicateGroupTreeNamesException;
 
 import java.util.HashMap;
@@ -35,8 +35,8 @@
             String treeName = group.getTreeName();
             Group curGroup = treeNameMap.put(treeName, group);
             if(curGroup != null) {
-                UserTable root = group.getRoot();
-                UserTable curRoot = curGroup.getRoot();
+                Table root = group.getRoot();
+                Table curRoot = curGroup.getRoot();
                 output.reportFailure(
                     new AISValidationFailure(
                             new DuplicateGroupTreeNamesException(root.getName(), curRoot.getName(), treeName)));

=== modified file 'src/main/java/com/akiban/ais/model/validation/IndexColumnIsNotPartial.java'
--- src/main/java/com/akiban/ais/model/validation/IndexColumnIsNotPartial.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/IndexColumnIsNotPartial.java	2013-05-28 23:28:27 +0000
@@ -20,7 +20,7 @@
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.Index;
 import com.akiban.ais.model.IndexColumn;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.error.IndexColumnIsPartialException;
 
 /**
@@ -30,7 +30,7 @@
 public class IndexColumnIsNotPartial implements AISValidation {
     @Override
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
-        for(UserTable table : ais.getUserTables().values()) {
+        for(Table table : ais.getTables().values()) {
             for(Index index : table.getIndexesIncludingInternal()) {
                 for(IndexColumn indexColumn : index.getKeyColumns()) {
                     if(indexColumn.getIndexedLength() != null) {

=== modified file 'src/main/java/com/akiban/ais/model/validation/IndexHasColumns.java'
--- src/main/java/com/akiban/ais/model/validation/IndexHasColumns.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/IndexHasColumns.java	2013-05-28 23:28:27 +0000
@@ -19,14 +19,14 @@
 
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.TableIndex;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.error.IndexLacksColumnsException;
 
 class IndexHasColumns implements AISValidation {
 
     @Override
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
-        for (UserTable table : ais.getUserTables().values()) {
+        for (Table table : ais.getTables().values()) {
             for (TableIndex index : table.getIndexesIncludingInternal()) {
                 if (index.getKeyColumns().size() == 0) {
                     output.reportFailure(new AISValidationFailure (

=== modified file 'src/main/java/com/akiban/ais/model/validation/IndexIDsPositive.java'
--- src/main/java/com/akiban/ais/model/validation/IndexIDsPositive.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/IndexIDsPositive.java	2013-05-28 23:28:27 +0000
@@ -20,7 +20,7 @@
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.Group;
 import com.akiban.ais.model.Index;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.error.InvalidIndexIDException;
 
 import java.util.Collection;
@@ -34,7 +34,7 @@
 public class IndexIDsPositive implements AISValidation {
     @Override
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
-        for(UserTable table : ais.getUserTables().values()) {
+        for(Table table : ais.getTables().values()) {
             checkIDs(table.getIndexesIncludingInternal(), output);
         }
         for(Group group : ais.getGroups().values()) {

=== modified file 'src/main/java/com/akiban/ais/model/validation/IndexIDsUnique.java'
--- src/main/java/com/akiban/ais/model/validation/IndexIDsUnique.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/IndexIDsUnique.java	2013-05-28 23:28:27 +0000
@@ -20,7 +20,7 @@
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.Group;
 import com.akiban.ais.model.Index;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 
 import com.akiban.server.error.DuplicateIndexIdException;
 
@@ -32,7 +32,7 @@
     @Override
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
         Map<Group, Map<Integer, Index>> byGroup = new HashMap<>();
-        for (UserTable table : ais.getUserTables().values()) {
+        for (Table table : ais.getTables().values()) {
             for (Index index : table.getIndexesIncludingInternal()) {
                 checkIndexID(byGroup, table.getGroup(), index, output);
             }

=== modified file 'src/main/java/com/akiban/ais/model/validation/IndexSizes.java'
--- src/main/java/com/akiban/ais/model/validation/IndexSizes.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/IndexSizes.java	2013-05-28 23:28:27 +0000
@@ -27,7 +27,7 @@
 import com.akiban.ais.model.Index;
 import com.akiban.ais.model.IndexColumn;
 import com.akiban.ais.model.Type;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.encoding.EncoderFactory;
 import com.akiban.server.error.JoinParentNoExplicitPK;
 import com.akiban.server.error.UnsupportedIndexPrefixException;
@@ -54,7 +54,7 @@
 
     @Override
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
-        for (UserTable table : ais.getUserTables().values()) {
+        for (Table table : ais.getTables().values()) {
             long hkeySize = 0;
             if (table.getGroup() != null) {
                 hkeySize = validateHKeySize (table, output);
@@ -114,7 +114,7 @@
         return EncoderFactory.valueOf(type.encoding(), type).getMaxKeyStorageSize(column);
     }
 
-    private long validateHKeySize (UserTable table, AISValidationOutput output) {
+    private long validateHKeySize (Table table, AISValidationOutput output) {
         long hkeySize = 0;
         HKey hkey; 
         try {

=== modified file 'src/main/java/com/akiban/ais/model/validation/IndexTreeNamesUnique.java'
--- src/main/java/com/akiban/ais/model/validation/IndexTreeNamesUnique.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/IndexTreeNamesUnique.java	2013-05-28 23:28:27 +0000
@@ -20,7 +20,7 @@
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.Group;
 import com.akiban.ais.model.Index;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.error.DuplicateIndexTreeNamesException;
 
 import java.util.Collection;
@@ -36,7 +36,7 @@
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
         Map<String,Index> treeNameMap = new HashMap<>();
 
-        for(UserTable table : ais.getUserTables().values()) {
+        for(Table table : ais.getTables().values()) {
             checkIndexes(output, treeNameMap, table.getIndexesIncludingInternal());
         }
 

=== modified file 'src/main/java/com/akiban/ais/model/validation/JoinToOneParent.java'
--- src/main/java/com/akiban/ais/model/validation/JoinToOneParent.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/JoinToOneParent.java	2013-05-28 23:28:27 +0000
@@ -22,7 +22,7 @@
 
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.Join;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.error.JoinToMultipleParentsException;
 
 
@@ -35,7 +35,7 @@
 
     @Override
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
-        Set<UserTable> childTables = new HashSet<>();
+        Set<Table> childTables = new HashSet<>();
         
         for (Join join : ais.getJoins().values()) {
             if (childTables.contains(join.getChild())) {

=== modified file 'src/main/java/com/akiban/ais/model/validation/MemoryTablesNotMixed.java'
--- src/main/java/com/akiban/ais/model/validation/MemoryTablesNotMixed.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/MemoryTablesNotMixed.java	2013-05-28 23:28:27 +0000
@@ -19,7 +19,7 @@
 
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.Group;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.error.GroupMixedTableTypes;
 
 /**
@@ -37,16 +37,16 @@
     }
 
     private static void validateGroup (AkibanInformationSchema ais, Group group, AISValidationOutput output) {
-        UserTable rootTable = group.getRoot();
+        Table rootTable = group.getRoot();
         if(rootTable == null) {
             return; // Caught elsewhere
         }
         boolean rootMemoryTable = rootTable.hasMemoryTableFactory();
-        for (UserTable userTable : ais.getUserTables().values()) {
-            if (userTable.getGroup() == group &&
-                    userTable.hasMemoryTableFactory() != rootMemoryTable) {
+        for (Table table : ais.getTables().values()) {
+            if (table.getGroup() == group &&
+                    table.hasMemoryTableFactory() != rootMemoryTable) {
                 output.reportFailure(new AISValidationFailure (
-                        new GroupMixedTableTypes(group.getName(), rootMemoryTable, userTable.getName())));
+                        new GroupMixedTableTypes(group.getName(), rootMemoryTable, table.getName())));
             }
         }
     }

=== modified file 'src/main/java/com/akiban/ais/model/validation/PrimaryKeyIsNotNull.java'
--- src/main/java/com/akiban/ais/model/validation/PrimaryKeyIsNotNull.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/PrimaryKeyIsNotNull.java	2013-05-28 23:28:27 +0000
@@ -20,7 +20,7 @@
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.Column;
 import com.akiban.ais.model.PrimaryKey;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.error.PrimaryKeyNullColumnException;
 
 /**
@@ -34,7 +34,7 @@
 
     @Override
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
-        for (UserTable table : ais.getUserTables().values()) {
+        for (Table table : ais.getTables().values()) {
             PrimaryKey index = table.getPrimaryKeyIncludingInternal();
             if(index == null) {
                 continue; // Checked by TableHasPrimaryKey

=== modified file 'src/main/java/com/akiban/ais/model/validation/ReferencesCorrect.java'
--- src/main/java/com/akiban/ais/model/validation/ReferencesCorrect.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/ReferencesCorrect.java	2013-05-28 23:28:27 +0000
@@ -27,7 +27,6 @@
 import com.akiban.ais.model.JoinColumn;
 import com.akiban.ais.model.Table;
 import com.akiban.ais.model.Type;
-import com.akiban.ais.model.UserTable;
 import com.akiban.ais.model.Visitor;
 import com.akiban.server.error.AISNullReferenceException;
 import com.akiban.server.error.BadAISInternalSettingException;
@@ -56,14 +55,11 @@
         }
 
         @Override
-        public void visitUserTable(UserTable userTable) {
-            visitingTable = userTable;
-            if (userTable == null) {
-                output.reportFailure(new AISValidationFailure(
-                        new AISNullReferenceException ("ais", "", "user table")));
-            } else if (userTable.isGroupTable()) {
-                output.reportFailure(new AISValidationFailure(
-                        new BadAISInternalSettingException("User table", userTable.getName().toString(), "isGroupTable")));
+        public void visitTable(Table table) {
+            visitingTable = table;
+            if (table == null) {
+                output.reportFailure(new AISValidationFailure(
+                        new AISNullReferenceException ("ais", "", "table")));
             }
         }
 
@@ -71,7 +67,7 @@
         public void visitColumn(Column column) {
             if (column == null) {
                 output.reportFailure(new AISValidationFailure(
-                        new AISNullReferenceException ("user table", visitingTable.getName().toString(), "column")));
+                        new AISNullReferenceException ("table", visitingTable.getName().toString(), "column")));
             } else if (column.getTable() != visitingTable) {
                 output.reportFailure(new AISValidationFailure(
                         new BadAISReferenceException ("column", column.getName(), "table", visitingTable.getName().toString())));

=== modified file 'src/main/java/com/akiban/ais/model/validation/SupportedColumnTypes.java'
--- src/main/java/com/akiban/ais/model/validation/SupportedColumnTypes.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/SupportedColumnTypes.java	2013-05-28 23:28:27 +0000
@@ -26,7 +26,7 @@
 import com.akiban.ais.model.JoinColumn;
 import com.akiban.ais.model.TableName;
 import com.akiban.ais.model.Type;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.ais.model.Visitor;
 import com.akiban.server.error.UnsupportedDataTypeException;
 import com.akiban.server.error.UnsupportedIndexDataTypeException;
@@ -91,7 +91,7 @@
         }
 
         @Override
-        public void visitUserTable(UserTable userTable) {
+        public void visitTable(Table table) {
         }
     }
 }

=== modified file 'src/main/java/com/akiban/ais/model/validation/TableHasPrimaryKey.java'
--- src/main/java/com/akiban/ais/model/validation/TableHasPrimaryKey.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/TableHasPrimaryKey.java	2013-05-28 23:28:27 +0000
@@ -18,14 +18,14 @@
 package com.akiban.ais.model.validation;
 
 import com.akiban.ais.model.AkibanInformationSchema;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.error.NoPrimaryKeyException;
 
 class TableHasPrimaryKey implements AISValidation {
 
     @Override
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
-        for (UserTable table : ais.getUserTables().values()) {
+        for (Table table : ais.getTables().values()) {
             if (table.getPrimaryKeyIncludingInternal() == null) {
                 output.reportFailure(new AISValidationFailure (
                         new NoPrimaryKeyException(table.getName())));

=== modified file 'src/main/java/com/akiban/ais/model/validation/TableIDsUnique.java'
--- src/main/java/com/akiban/ais/model/validation/TableIDsUnique.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/TableIDsUnique.java	2013-05-28 23:28:27 +0000
@@ -23,14 +23,13 @@
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.Table;
 import com.akiban.ais.model.TableName;
-import com.akiban.ais.model.UserTable;
 import com.akiban.server.error.DuplicateTableIdException;
 
 class TableIDsUnique implements AISValidation {
     @Override
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
         final Map<Integer, Table> tableIDList= new TreeMap<>();
-        for (UserTable table : ais.getUserTables().values()) {
+        for (Table table : ais.getTables().values()) {
             checkTableID (output, tableIDList, table);
         }
     }

=== modified file 'src/main/java/com/akiban/ais/model/validation/TablesInAGroup.java'
--- src/main/java/com/akiban/ais/model/validation/TablesInAGroup.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/TablesInAGroup.java	2013-05-28 23:28:27 +0000
@@ -18,19 +18,19 @@
 package com.akiban.ais.model.validation;
 
 import com.akiban.ais.model.AkibanInformationSchema;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.error.TableNotInGroupException;
 
 /**
  * Validates that all tables belong to a group, 
- * All user tables should be in a group.
+ * All tables should be in a group.
  * @author tjoneslo
  */
 class TablesInAGroup implements AISValidation {
 
     @Override
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
-        for (UserTable table : ais.getUserTables().values()) {
+        for (Table table : ais.getTables().values()) {
             if (table.getGroup() == null) {
                 output.reportFailure(new AISValidationFailure (
                         new TableNotInGroupException (table.getName())));

=== modified file 'src/main/java/com/akiban/ais/model/validation/TreeNamesAreNotNull.java'
--- src/main/java/com/akiban/ais/model/validation/TreeNamesAreNotNull.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/model/validation/TreeNamesAreNotNull.java	2013-05-28 23:28:27 +0000
@@ -23,7 +23,6 @@
 import com.akiban.ais.model.Sequence;
 import com.akiban.ais.model.Table;
 import com.akiban.ais.model.TableIndex;
-import com.akiban.ais.model.UserTable;
 import com.akiban.server.error.GroupTreeNameIsNullException;
 import com.akiban.server.error.IndexTreeNameIsNullException;
 import com.akiban.server.error.SequenceTreeNameIsNullException;
@@ -37,7 +36,7 @@
 
     @Override
     public void validate(AkibanInformationSchema ais, AISValidationOutput output) {
-        for(UserTable table : ais.getUserTables().values()) {
+        for(Table table : ais.getTables().values()) {
             checkTable(table);
         }
         for(Group group : ais.getGroups().values()) {
@@ -59,11 +58,7 @@
 
     private static void checkTable(Table table) {
         final Collection<TableIndex> indexes;
-        if(table.isUserTable()) {
-            indexes = ((UserTable)table).getIndexesIncludingInternal();
-        } else {
-            indexes = table.getIndexes();
-        }
+        indexes = table.getIndexesIncludingInternal();
         for(Index index : indexes) {
             checkIndex(index);
         }

=== modified file 'src/main/java/com/akiban/ais/protobuf/ProtobufReader.java'
--- src/main/java/com/akiban/ais/protobuf/ProtobufReader.java	2013-05-24 21:45:54 +0000
+++ src/main/java/com/akiban/ais/protobuf/ProtobufReader.java	2013-05-28 23:28:27 +0000
@@ -169,10 +169,10 @@
         
         for(NewGroupInfo newGroupInfo : newGroups) {
             String rootTableName = newGroupInfo.pbGroup.getRootTableName();
-            UserTable rootUserTable = destAIS.getUserTable(newGroupInfo.schema, rootTableName);
-            rootUserTable.setGroup(newGroupInfo.group);
-            joinsNeedingGroup.addAll(rootUserTable.getCandidateChildJoins());
-            newGroupInfo.group.setRootTable(rootUserTable);
+            Table rootTable = destAIS.getTable(newGroupInfo.schema, rootTableName);
+            rootTable.setGroup(newGroupInfo.group);
+            joinsNeedingGroup.addAll(rootTable.getCandidateChildJoins());
+            newGroupInfo.group.setRootTable(rootTable);
         }
         
         for(int i = 0; i < joinsNeedingGroup.size(); ++i) {
@@ -193,14 +193,14 @@
         int generatedId = 1;
         for(AISProtobuf.Table pbTable : pbTables) {
             hasRequiredFields(pbTable);
-            UserTable userTable = UserTable.create(
+            Table table = Table.create(
                     destAIS,
                     schema,
                     pbTable.getTableName(),
                     pbTable.hasTableId() ? pbTable.getTableId() : generatedId++
             );
             if(pbTable.hasOrdinal()) {
-                userTable.setOrdinal(pbTable.getOrdinal());
+                table.setOrdinal(pbTable.getOrdinal());
             }
             UUID uuid;
             if (pbTable.hasUuid()) {
@@ -211,16 +211,16 @@
                             AISProtobuf.Table.getDescriptor().getFullName(),
                             "invalid UUID string: " + pbTable.getUuid());
                 }
-                userTable.setUuid(uuid);
+                table.setUuid(uuid);
             }
-            userTable.setCharsetAndCollation(getCharColl(pbTable.hasCharColl(), pbTable.getCharColl()));
+            table.setCharsetAndCollation(getCharColl(pbTable.hasCharColl(), pbTable.getCharColl()));
             if(pbTable.hasVersion()) {
-                userTable.setVersion(pbTable.getVersion());
+                table.setVersion(pbTable.getVersion());
             }
-            loadColumns(userTable, pbTable.getColumnsList());
-            loadTableIndexes(userTable, pbTable.getIndexesList());
+            loadColumns(table, pbTable.getColumnsList());
+            loadTableIndexes(table, pbTable.getIndexesList());
             if (pbTable.hasPendingOSC()) {
-                userTable.setPendingOSC(loadPendingOSC(pbTable.getPendingOSC()));
+                table.setPendingOSC(loadPendingOSC(pbTable.getPendingOSC()));
             }
         }
     }
@@ -254,8 +254,8 @@
                 hasRequiredFields(pbJoin);
                 AISProtobuf.TableName pbParentName = pbJoin.getParentTable();
                 hasRequiredFields(pbParentName);
-                UserTable childTable = destAIS.getUserTable(schema, pbTable.getTableName());
-                UserTable parentTable = destAIS.getUserTable(pbParentName.getSchemaName(), pbParentName.getTableName());
+                Table childTable = destAIS.getTable(schema, pbTable.getTableName());
+                Table parentTable = destAIS.getTable(pbParentName.getSchemaName(), pbParentName.getTableName());
 
                 if(parentTable == null) {
                     throw new ProtobufReadException(
@@ -375,12 +375,12 @@
         }
     }
     
-    private void loadTableIndexes(UserTable userTable, Collection<AISProtobuf.Index> pbIndexes) {
+    private void loadTableIndexes(Table table, Collection<AISProtobuf.Index> pbIndexes) {
         for(AISProtobuf.Index pbIndex : pbIndexes) {
             hasRequiredFields(pbIndex);
             TableIndex tableIndex = TableIndex.create(
                     destAIS,
-                    userTable,
+                    table,
                     pbIndex.getIndexName(),
                     pbIndex.getIndexId(),
                     pbIndex.getIsUnique(),
@@ -388,7 +388,7 @@
             );
             handleTreeName(tableIndex, pbIndex);
             handleSpatial(tableIndex, pbIndex);
-            loadIndexColumns(userTable, tableIndex, pbIndex.getColumnsList());
+            loadIndexColumns(table, tableIndex, pbIndex.getColumnsList());
         }
     }
 
@@ -414,16 +414,16 @@
         for(AISProtobuf.Table pbTable : pbTables) {
             for(AISProtobuf.Index pbIndex : pbTable.getFullTextIndexesList()) {
                 hasRequiredFields(pbIndex);
-                UserTable userTable = destAIS.getUserTable(schema, pbTable.getTableName());
+                Table table = destAIS.getTable(schema, pbTable.getTableName());
                 FullTextIndex textIndex = FullTextIndex.create(
                         destAIS,
-                        userTable,
+                        table,
                         pbIndex.getIndexName(),
                         pbIndex.getIndexId()
                         );
                 handleTreeName(textIndex, pbIndex);
                 handleSpatial(textIndex, pbIndex);
-                loadIndexColumns(userTable, textIndex, pbIndex.getColumnsList());
+                loadIndexColumns(table, textIndex, pbIndex.getColumnsList());
             }
         }        
     }
@@ -451,12 +451,12 @@
         }
     }
 
-    private void loadIndexColumns(UserTable table, Index index, Collection<AISProtobuf.IndexColumn> pbIndexColumns) {
+    private void loadIndexColumns(Table table, Index index, Collection<AISProtobuf.IndexColumn> pbIndexColumns) {
         for(AISProtobuf.IndexColumn pbIndexColumn : pbIndexColumns) {
             hasRequiredFields(pbIndexColumn);
             if(pbIndexColumn.hasTableName()) {
                 hasRequiredFields(pbIndexColumn.getTableName());
-                table = destAIS.getUserTable(convertTableNameOrNull(true, pbIndexColumn.getTableName()));
+                table = destAIS.getTable(convertTableNameOrNull(true, pbIndexColumn.getTableName()));
             }
             Integer indexedLength = null;
             if(pbIndexColumn.hasIndexedLength()) {

=== modified file 'src/main/java/com/akiban/ais/protobuf/ProtobufWriter.java'
--- src/main/java/com/akiban/ais/protobuf/ProtobufWriter.java	2013-05-24 21:45:54 +0000
+++ src/main/java/com/akiban/ais/protobuf/ProtobufWriter.java	2013-05-28 23:28:27 +0000
@@ -33,9 +33,9 @@
     public static interface WriteSelector {
         Columnar getSelected(Columnar columnar);
         boolean isSelected(Group group);
-        /** Called for all parent joins where getSelected(UserTable) is not null **/
+        /** Called for all parent joins where getSelected(Table) is not null **/
         boolean isSelected(Join parentJoin);
-        /** Called for all GroupIndexes and all table indexes where getSelected(UserTable) is not null **/
+        /** Called for all GroupIndexes and all table indexes where getSelected(Table) is not null **/
         boolean isSelected(Index index);
         boolean isSelected(Sequence sequence);
         boolean isSelected(Routine routine);
@@ -258,8 +258,8 @@
         boolean isEmpty = true;
 
         // Write groups into same schema as root table
-        for(UserTable table : schema.getUserTables().values()) {
-            table = (UserTable)selector.getSelected(table);
+        for(Table table : schema.getTables().values()) {
+            table = (Table)selector.getSelected(table);
             if(table != null) {
                 Group group = table.getGroup();
                 if((table.getParentJoin() == null) && (group != null) && selector.isSelected(group)) {
@@ -305,7 +305,7 @@
     }
 
     private static void writeGroup(AISProtobuf.Schema.Builder schemaBuilder, Group group, WriteSelector selector) {
-        final UserTable rootTable = group.getRoot();
+        final Table rootTable = group.getRoot();
         AISProtobuf.Group.Builder groupBuilder = AISProtobuf.Group.newBuilder().
                 setRootTableName(rootTable.getName().getTableName());
         if(group.getTreeName() != null) {
@@ -321,7 +321,7 @@
         schemaBuilder.addGroups(groupBuilder.build());
     }
 
-    private static void writeTable(AISProtobuf.Schema.Builder schemaBuilder, UserTable table, WriteSelector selector) {
+    private static void writeTable(AISProtobuf.Schema.Builder schemaBuilder, Table table, WriteSelector selector) {
         AISProtobuf.Table.Builder tableBuilder = AISProtobuf.Table.newBuilder();
         tableBuilder.
                 setTableName(table.getName().getTableName()).
@@ -353,7 +353,7 @@
 
         Join join = table.getParentJoin();
         if((join != null) && selector.isSelected(join)) {
-            final UserTable parent = join.getParent();
+            final Table parent = join.getParent();
             AISProtobuf.Join.Builder joinBuilder = AISProtobuf.Join.newBuilder();
             joinBuilder.setParentTable(AISProtobuf.TableName.newBuilder().
                     setSchemaName(parent.getName().getSchemaName()).

=== modified file 'src/main/java/com/akiban/ais/util/AISPrinter.java'
--- src/main/java/com/akiban/ais/util/AISPrinter.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/util/AISPrinter.java	2013-05-28 23:28:27 +0000
@@ -29,7 +29,7 @@
 import com.akiban.ais.model.Join;
 import com.akiban.ais.model.JoinColumn;
 import com.akiban.ais.model.Type;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.ais.model.Visitor;
 
 public class AISPrinter
@@ -75,9 +75,9 @@
             }
 
             @Override
-            public void visitUserTable(UserTable userTable) 
+            public void visitTable(Table table)
             {
-                output.println(userTable);
+                output.println(table);
             }
 
             @Override

=== modified file 'src/main/java/com/akiban/ais/util/ChangedTableDescription.java'
--- src/main/java/com/akiban/ais/util/ChangedTableDescription.java	2013-05-28 21:18:45 +0000
+++ src/main/java/com/akiban/ais/util/ChangedTableDescription.java	2013-05-28 23:28:27 +0000
@@ -18,7 +18,7 @@
 package com.akiban.ais.util;
 
 import com.akiban.ais.model.TableName;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.util.ArgumentValidation;
 
 import java.util.Collection;
@@ -42,7 +42,7 @@
     }
 
     private final TableName tableName;
-    private final UserTable newDefinition;
+    private final Table newDefinition;
     private final Map<String,String> colNames;
     private final ParentChange parentChange;
     private final TableName parentName;
@@ -56,7 +56,7 @@
      * @param newDefinition New definition of the table.
      * @param preserveIndexes Mapping of new index names to old.
      */
-    public ChangedTableDescription(TableName tableName, UserTable newDefinition, Map<String,String> colNames,
+    public ChangedTableDescription(TableName tableName, Table newDefinition, Map<String,String> colNames,
                                    ParentChange parentChange, TableName parentName, Map<String,String> parentColNames,
                                    Map<String, String> preserveIndexes, Collection<TableName> droppedSequences,
                                    Collection<String> identityAdded) {
@@ -81,7 +81,7 @@
         return (newDefinition != null) ? newDefinition.getName() : tableName;
     }
 
-    public UserTable getNewDefinition() {
+    public Table getNewDefinition() {
         return newDefinition;
     }
 

=== modified file 'src/main/java/com/akiban/ais/util/DDLGenerator.java'
--- src/main/java/com/akiban/ais/util/DDLGenerator.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/util/DDLGenerator.java	2013-05-28 23:28:27 +0000
@@ -30,7 +30,6 @@
 import com.akiban.ais.model.Type;
 import com.akiban.ais.model.Join;
 import com.akiban.ais.model.Types;
-import com.akiban.ais.model.UserTable;
 
 public class DDLGenerator
 {
@@ -159,8 +158,8 @@
             columnDecls.add(declaration(indexColumn));
         }
         
-        if(index.getConstraint().equals("FOREIGN KEY") && index.getTable().isUserTable()) {
-            Join join = ((UserTable)index.getTable()).getParentJoin();
+        if(index.getConstraint().equals("FOREIGN KEY")) {
+            Join join = (index.getTable()).getParentJoin();
             
             if(join == null) {
                 return new String("");
@@ -197,9 +196,6 @@
 
     private String tableOptions(Table table) {
         StringBuilder tableOptions = new StringBuilder();
-        final String engine = table.getEngine() != null ? table.getEngine() : "akibandb";
-        tableOptions.append(" engine=");
-        tableOptions.append(engine);
         final CharsetAndCollation charAndCol = table.getCharsetAndCollation();
         tableOptions.append(" DEFAULT CHARSET=");
         tableOptions.append(charAndCol.charset());

=== modified file 'src/main/java/com/akiban/ais/util/TableChangeValidator.java'
--- src/main/java/com/akiban/ais/util/TableChangeValidator.java	2013-05-28 21:18:45 +0000
+++ src/main/java/com/akiban/ais/util/TableChangeValidator.java	2013-05-28 23:28:27 +0000
@@ -28,7 +28,7 @@
 import com.akiban.ais.model.Sequence;
 import com.akiban.ais.model.TableIndex;
 import com.akiban.ais.model.TableName;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.types3.Types3Switch;
 import com.akiban.util.ArgumentValidation;
 import com.akiban.util.MultipleCauseException;
@@ -77,8 +77,8 @@
         }
     }
 
-    private final UserTable oldTable;
-    private final UserTable newTable;
+    private final Table oldTable;
+    private final Table newTable;
     private final List<TableChange> columnChanges;
     private final List<TableChange> indexChanges;
     private final List<RuntimeException> errors;
@@ -91,7 +91,7 @@
     private boolean primaryKeyChanged;
     private boolean didCompare;
 
-    public TableChangeValidator(UserTable oldTable, UserTable newTable,
+    public TableChangeValidator(Table oldTable, Table newTable,
                                 List<TableChange> columnChanges, List<TableChange> indexChanges,
                                 boolean automaticIndexChanges) {
         ArgumentValidation.notNull("oldTable", oldTable);
@@ -229,8 +229,8 @@
     }
 
     private void compareGroupIndexes() {
-        final Set<UserTable> keepTables = new HashSet<>();
-        final UserTable traverseStart;
+        final Set<Table> keepTables = new HashSet<>();
+        final Table traverseStart;
         if(parentChange == ParentChange.DROP) {
             traverseStart = oldTable;
         } else {
@@ -239,7 +239,7 @@
 
         traverseStart.traverseTableAndDescendants(new NopVisitor() {
             @Override
-            public void visitUserTable(UserTable table) {
+            public void visitTable(Table table) {
                 keepTables.add(table);
             }
         });
@@ -249,7 +249,7 @@
             List<TableColumnNames> remainingCols = new ArrayList<>();
             for(IndexColumn iCol : index.getKeyColumns()) {
                 Column column = iCol.getColumn();
-                if(!keepTables.contains(column.getUserTable())) {
+                if(!keepTables.contains(column.getTable())) {
                     remainingCols.clear();
                     break;
                 }
@@ -443,7 +443,7 @@
 
         Collection<Join> oldChildJoins = new ArrayList<>(oldTable.getCandidateChildJoins());
         for(Join join : oldChildJoins) {
-            UserTable oldChildTable = join.getChild();
+            Table oldChildTable = join.getChild();
 
             // If referenced column has anymore has a TABLE change (or is missing), join needs dropped
             boolean dropParent = false;
@@ -488,10 +488,10 @@
         }
     }
 
-    private void propagateChildChange(final UserTable table, final ParentChange change, final boolean allIndexes) {
+    private void propagateChildChange(final Table table, final ParentChange change, final boolean allIndexes) {
         table.traverseTableAndDescendants(new NopVisitor() {
             @Override
-            public void visitUserTable(UserTable curTable) {
+            public void visitTable(Table curTable) {
                 if(table != curTable) {
                     TableName parentName = curTable.getParentJoin().getParent().getName();
                     trackChangedTable(curTable, change, parentName, null, allIndexes);
@@ -500,7 +500,7 @@
         });
     }
 
-    private void trackChangedTable(UserTable table, ParentChange parentChange, TableName parentName,
+    private void trackChangedTable(Table table, ParentChange parentChange, TableName parentName,
                                    Map<String, String> parentRenames, boolean doPreserve) {
         Map<String,String> preserved = new HashMap<>();
         if(doPreserve) {
@@ -634,8 +634,8 @@
             return ParentChange.ADD;
         }
 
-        UserTable oldParent = oldJoin.getParent();
-        UserTable newParent = newJoin.getParent();
+        Table oldParent = oldJoin.getParent();
+        Table newParent = newJoin.getParent();
         if(!oldParent.getName().equals(newParent.getName()) ||
            (oldJoin.getJoinColumns().size() != newJoin.getJoinColumns().size())) {
             return ParentChange.ADD;

=== modified file 'src/main/java/com/akiban/ais/util/UuidAssigner.java'
--- src/main/java/com/akiban/ais/util/UuidAssigner.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/ais/util/UuidAssigner.java	2013-05-28 23:28:27 +0000
@@ -19,17 +19,17 @@
 
 import com.akiban.ais.model.Column;
 import com.akiban.ais.model.NopVisitor;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 
 import java.util.UUID;
 
 public class UuidAssigner extends NopVisitor {
 
     @Override
-    public void visitUserTable(UserTable userTable) {
-        if (userTable.getUuid() == null) {
+    public void visitTable(Table table) {
+        if (table.getUuid() == null) {
             assignedAny = true;
-            userTable.setUuid(UUID.randomUUID());
+            table.setUuid(UUID.randomUUID());
         }
     }
 

=== modified file 'src/main/java/com/akiban/direct/ClassBuilder.java'
--- src/main/java/com/akiban/direct/ClassBuilder.java	2013-04-24 15:50:16 +0000
+++ src/main/java/com/akiban/direct/ClassBuilder.java	2013-05-28 23:28:27 +0000
@@ -35,7 +35,7 @@
 import com.akiban.ais.model.PrimaryKey;
 import com.akiban.ais.model.Schema;
 import com.akiban.ais.model.TableName;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.server.error.NoSuchTableException;
 import com.akiban.server.types.AkType;
 import com.sun.jersey.core.impl.provider.entity.Inflector;
@@ -118,7 +118,7 @@
         Map<Integer, CtClass> implClassMap = new TreeMap<Integer, CtClass>();
 
         helper.startClass(scn, true, null, null, IMPORTS);
-        for (final UserTable table : ais.getSchema(schema).getUserTables().values()) {
+        for (final Table table : ais.getSchema(schema).getTables().values()) {
             if (table.isRoot()) {
                 helper.addExtentAccessor(table, scn, true);
             }
@@ -132,7 +132,7 @@
          * Precompile the implementation classes
          */
 
-        for (final UserTable table : ais.getSchema(schema).getUserTables().values()) {
+        for (final Table table : ais.getSchema(schema).getTables().values()) {
             helper.generateImplementationClass(table, schema);
             implClassMap.put(table.getTableId(), helper.getCurrentClass());
         }
@@ -140,7 +140,7 @@
          * Precompile the extent class
          */
         helper.startExtentClass(schema, scn);
-        for (final UserTable table : ais.getSchema(schema).getUserTables().values()) {
+        for (final Table table : ais.getSchema(schema).getTables().values()) {
             if (table.isRoot()) {
                 helper.addExtentAccessor(table, scn, false);
             }
@@ -157,14 +157,14 @@
         String scn = schemaClassName(schema);
         startClass(scn, true, null, null, IMPORTS);
         if ("*".equals(tableName.getTableName())) {
-            for (final UserTable table : ais.getSchema(schema).getUserTables().values()) {
+            for (final Table table : ais.getSchema(schema).getTables().values()) {
                 if (table.isRoot()) {
                     addExtentAccessor(table, scn, true);
                 }
                 generateInterfaceClass(table, scn);
             }
         } else {
-            final UserTable table = ais.getUserTable(tableName);
+            final Table table = ais.getTable(tableName);
             if (table == null) {
                 throw new NoSuchTableException(tableName);
             }
@@ -180,12 +180,12 @@
             throws CannotCompileException, NotFoundException {
         if ("*".equals(tableName.getTableName())) {
             Schema schema = ais.getSchema(tableName.getSchemaName());
-            for (final UserTable table : schema.getUserTables().values()) {
+            for (final Table table : schema.getTables().values()) {
                 generateImplementationClass(table, tableName.getSchemaName());
             }
             String scn = schemaClassName(tableName.getSchemaName());
             startExtentClass(tableName.getSchemaName(), scn);
-            for (final UserTable table : schema.getUserTables().values()) {
+            for (final Table table : schema.getTables().values()) {
                 if (table.isRoot()) {
                     addExtentAccessor(table, scn, false);
                 }
@@ -193,7 +193,7 @@
             end();
 
         } else {
-            UserTable table = ais.getUserTable(tableName);
+            Table table = ais.getTable(tableName);
             if (table == null) {
                 throw new NoSuchTableException(tableName);
             }
@@ -206,11 +206,11 @@
         final String schema = tableName.getSchemaName();
         String scn = schemaClassName(schema);
         if ("*".equals(tableName.getTableName())) {
-            for (final UserTable table : ais.getSchema(schema).getUserTables().values()) {
+            for (final Table table : ais.getSchema(schema).getTables().values()) {
                 generateInterfaceClass(table, scn);
             }
             startClass("$$$extent$$$", true, null, null, null);
-            for (final UserTable table : ais.getSchema(schema).getUserTables().values()) {
+            for (final Table table : ais.getSchema(schema).getTables().values()) {
                 if (table.isRoot()) {
                     addExtentAccessor(table, scn, false);
                 }
@@ -218,7 +218,7 @@
             end();
 
         } else {
-            final UserTable table = ais.getUserTable(tableName);
+            final Table table = ais.getTable(tableName);
             if (table == null) {
                 throw new NoSuchTableException(tableName);
             }
@@ -226,7 +226,7 @@
         }
     }
 
-    void generateInterfaceClass(UserTable table, String scn) throws CannotCompileException, NotFoundException {
+    void generateInterfaceClass(Table table, String scn) throws CannotCompileException, NotFoundException {
         table.getName().getTableName();
         String typeName = scn + "$" + asJavaName(table.getName().getTableName(), true);
         startClass(typeName, true, null, null, null);
@@ -235,7 +235,7 @@
         end();
     }
 
-    void generateImplementationClass(UserTable table, String schemaName) throws CannotCompileException,
+    void generateImplementationClass(Table table, String schemaName) throws CannotCompileException,
             NotFoundException {
         table.getName().getTableName();
         String scn = schemaClassName(schemaName);
@@ -254,7 +254,7 @@
         addStaticInitializer(null);
     }
 
-    void addExtentAccessor(UserTable table, String scn, boolean iface) {
+    void addExtentAccessor(Table table, String scn, boolean iface) {
         String tableName = table.getName().getTableName();
         String className = scn + "$" + asJavaName(tableName, true);
 
@@ -293,7 +293,7 @@
         }
     }
 
-    private void addMethods(UserTable table, String scn, String typeName, String className, boolean iface) {
+    private void addMethods(Table table, String scn, String typeName, String className, boolean iface) {
         /*
          * Add a property per column
          */
@@ -314,7 +314,7 @@
          */
         Join parentJoin = table.getParentJoin();
         if (parentJoin != null) {
-            UserTable parentTable = parentJoin.getParent();
+            Table parentTable = parentJoin.getParent();
             String parentTableName = parentTable.getName().getTableName();
             String parentClassName = scn + "$" + asJavaName(parentTableName, true);
             String[] body = null;
@@ -393,7 +393,7 @@
      * will give the base class metadata about the columns.
      */
     @SuppressWarnings("unchecked")
-    private String columnMetadataString(final UserTable table) {
+    private String columnMetadataString(final Table table) {
         String[] columnArray = new String[table == null ? 0 : table.getColumns().size()];
         if (table != null) {
             PrimaryKey pk = table.getPrimaryKey();
@@ -490,7 +490,7 @@
 
     }
 
-    private String buildDirectIterableExpr(final String className, final UserTable table) {
+    private String buildDirectIterableExpr(final String className, final Table table) {
         return String.format("(new com.akiban.direct.DirectIterableImpl" + "(%s.class, \"%s\", this))",
                 className, table.getName().getTableName());
     }

=== modified file 'src/main/java/com/akiban/qp/loadableplan/std/DumpGroupLoadablePlan.java'
--- src/main/java/com/akiban/qp/loadableplan/std/DumpGroupLoadablePlan.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/loadableplan/std/DumpGroupLoadablePlan.java	2013-05-28 23:28:27 +0000
@@ -18,7 +18,7 @@
 package com.akiban.qp.loadableplan.std;
 
 import com.akiban.ais.model.TableName;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.qp.loadableplan.DirectObjectCursor;
 import com.akiban.qp.loadableplan.DirectObjectPlan;
 import com.akiban.qp.loadableplan.LoadableDirectObjectPlan;
@@ -65,9 +65,9 @@
 
     public static class DumpGroupDirectObjectCursor extends DirectObjectCursor {
         private final QueryContext context;
-        private UserTable rootTable;
+        private Table rootTable;
         private Cursor cursor;
-        private Map<UserTable,Integer> tableSizes;
+        private Map<Table,Integer> tableSizes;
         private StringBuilder buffer;
         private GroupRowFormatter formatter;
         private int messagesSent;
@@ -95,7 +95,7 @@
                 tableName = context.getValue(1).getString();
             }
             rootTable = context.getStore().schema().ais()
-                .getUserTable(schemaName, tableName);
+                .getTable(schemaName, tableName);
             if (rootTable == null)
                 throw new NoSuchTableException(schemaName, tableName);
             cursor = context.getStore(rootTable)
@@ -132,7 +132,7 @@
                     break;
                 }
                 RowType rowType = row.rowType();
-                UserTable rowTable = rowType.userTable();
+                Table rowTable = rowType.table();
                 int size = tableSize(rowTable);
                 if (size < 0)
                     continue;
@@ -163,7 +163,7 @@
             }
         }
 
-        private int tableSize(UserTable table) {
+        private int tableSize(Table table) {
             Integer size = tableSizes.get(table);
             if (size == null) {
                 if (table.isDescendantOf(rootTable))
@@ -191,7 +191,7 @@
     }
 
     public static class SQLRowFormatter extends GroupRowFormatter {
-        private Map<UserTable,String> tableNames = new HashMap<>();
+        private Map<Table,String> tableNames = new HashMap<>();
         private int maxRowCount;
         private SqlLiteralValueFormatter literalFormatter;
         private AkibanAppender appender;
@@ -224,7 +224,7 @@
                 flush();
                 int pos = buffer.length();
                 buffer.append("INSERT INTO ");
-                buffer.append(tableName(rowType.userTable()));
+                buffer.append(tableName(rowType.table()));
                 buffer.append(" VALUES");
                 insertWidth = buffer.length() - pos;
                 lastRowType = rowType;
@@ -252,7 +252,7 @@
             }
         }
 
-        protected String tableName(UserTable table) {
+        protected String tableName(Table table) {
             String name = tableNames.get(table);
             if (name == null) {
                 TableName tableName = table.getName();

=== modified file 'src/main/java/com/akiban/qp/memoryadapter/BasicFactoryBase.java'
--- src/main/java/com/akiban/qp/memoryadapter/BasicFactoryBase.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/memoryadapter/BasicFactoryBase.java	2013-05-28 23:28:27 +0000
@@ -52,7 +52,7 @@
     }
 
     public RowType getRowType(MemoryAdapter adapter) {
-        return adapter.schema().userTableRowType(adapter.schema().ais().getUserTable(sourceTable));
+        return adapter.schema().tableRowType(adapter.schema().ais().getTable(sourceTable));
     }
     
     public static String boolResult(boolean bool) {

=== modified file 'src/main/java/com/akiban/qp/memoryadapter/MemoryAdapter.java'
--- src/main/java/com/akiban/qp/memoryadapter/MemoryAdapter.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/memoryadapter/MemoryAdapter.java	2013-05-28 23:28:27 +0000
@@ -21,7 +21,6 @@
 import com.akiban.ais.model.Index;
 import com.akiban.ais.model.Table;
 import com.akiban.ais.model.TableName;
-import com.akiban.ais.model.UserTable;
 import com.akiban.qp.expression.IndexKeyRange;
 import com.akiban.qp.operator.Cursor;
 import com.akiban.qp.operator.GroupCursor;
@@ -69,19 +68,15 @@
     public Cursor newIndexCursor(QueryContext context, Index index,
             IndexKeyRange keyRange, Ordering ordering,
             IndexScanSelector scanSelector, boolean usePValues) {
-        
         Table table = index.rootMostTable();
-        if (table.isUserTable()) {
-            return ((UserTable)table).getMemoryTableFactory().getIndexCursor(index, getSession(), keyRange, ordering, scanSelector);
-        }
-        throw new UnsupportedOperationException();
+        return table.getMemoryTableFactory().getIndexCursor(index, getSession(), keyRange, ordering, scanSelector);
     }
 
     @Override
     public long rowCount(RowType tableType) {
         long count = 0;
-        if (tableType.hasUserTable()) {
-            count = tableType.userTable().getMemoryTableFactory().rowCount();
+        if (tableType.hasTable()) {
+            count = tableType.table().getMemoryTableFactory().rowCount();
         }
         return count;
     }

=== modified file 'src/main/java/com/akiban/qp/memoryadapter/SimpleMemoryGroupScan.java'
--- src/main/java/com/akiban/qp/memoryadapter/SimpleMemoryGroupScan.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/memoryadapter/SimpleMemoryGroupScan.java	2013-05-28 23:28:27 +0000
@@ -43,7 +43,7 @@
 
     public SimpleMemoryGroupScan(MemoryAdapter adapter, TableName tableName, Iterator<? extends T> iterator) {
         this.iterator = iterator;
-        this.rowType = adapter.schema().userTableRowType(adapter.schema().ais().getUserTable(tableName));
+        this.rowType = adapter.schema().tableRowType(adapter.schema().ais().getTable(tableName));
     }
 
     private final Iterator<? extends T> iterator;

=== modified file 'src/main/java/com/akiban/qp/operator/API.java'
--- src/main/java/com/akiban/qp/operator/API.java	2013-04-30 23:01:23 +0000
+++ src/main/java/com/akiban/qp/operator/API.java	2013-05-28 23:28:27 +0000
@@ -18,19 +18,18 @@
 package com.akiban.qp.operator;
 
 import com.akiban.ais.model.Group;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.qp.exec.UpdatePlannable;
 import com.akiban.qp.expression.IndexKeyRange;
 import com.akiban.qp.row.BindableRow;
 import com.akiban.qp.row.RowBase;
 import com.akiban.qp.rowtype.IndexRowType;
 import com.akiban.qp.rowtype.RowType;
-import com.akiban.qp.rowtype.UserTableRowType;
+import com.akiban.qp.rowtype.TableRowType;
 import com.akiban.server.aggregation.AggregatorRegistry;
 import com.akiban.server.aggregation.Aggregators;
 import com.akiban.server.collation.AkCollator;
 import com.akiban.server.expression.Expression;
-import com.akiban.server.types.AkType;
 import com.akiban.server.types3.TAggregator;
 import com.akiban.server.types3.TComparison;
 import com.akiban.server.types3.TInstance;
@@ -168,8 +167,8 @@
     public static Operator groupScan_Default(Group group,
                                              int hKeyBindingPosition,
                                              boolean deep,
-                                             UserTable hKeyType,
-                                             UserTable shortenUntil)
+                                             Table hKeyType,
+                                             Table shortenUntil)
     {
         return new GroupScan_Default(
                 new GroupScan_Default.PositionalGroupCursorCreator(group, hKeyBindingPosition, deep, hKeyType, shortenUntil));
@@ -187,7 +186,7 @@
     public static Operator branchLookup_Default(Operator inputOperator,
                                                 Group group,
                                                 RowType inputRowType,
-                                                UserTableRowType outputRowType,
+                                                TableRowType outputRowType,
                                                 InputPreservationOption flag)
     {
         return branchLookup_Default(inputOperator, group, inputRowType, outputRowType, flag, NO_LIMIT);
@@ -196,7 +195,7 @@
     public static Operator branchLookup_Default(Operator inputOperator,
                                                 Group group,
                                                 RowType inputRowType,
-                                                UserTableRowType outputRowType,
+                                                TableRowType outputRowType,
                                                 InputPreservationOption flag,
                                                 Limit limit)
     {
@@ -206,7 +205,7 @@
     /** deprecated */
     public static Operator branchLookup_Nested(Group group,
                                                RowType inputRowType,
-                                               UserTableRowType outputRowType,
+                                               TableRowType outputRowType,
                                                InputPreservationOption flag,
                                                int inputBindingPosition)
     {
@@ -220,8 +219,8 @@
 
     public static Operator branchLookup_Nested(Group group,
                                                RowType inputRowType,
-                                               UserTableRowType ancestorRowType,
-                                               UserTableRowType outputRowType,
+                                               TableRowType ancestorRowType,
+                                               TableRowType outputRowType,
                                                InputPreservationOption flag,
                                                int inputBindingPosition)
     {
@@ -254,7 +253,7 @@
     public static Operator ancestorLookup_Default(Operator inputOperator,
                                                   Group group,
                                                   RowType rowType,
-                                                  Collection<UserTableRowType> ancestorTypes,
+                                                  Collection<TableRowType> ancestorTypes,
                                                   InputPreservationOption flag)
     {
         return new AncestorLookup_Default(inputOperator, group, rowType, ancestorTypes, flag);
@@ -262,7 +261,7 @@
 
     public static Operator ancestorLookup_Nested(Group group,
                                                  RowType rowType,
-                                                 Collection<UserTableRowType> ancestorTypes,
+                                                 Collection<TableRowType> ancestorTypes,
                                                  int hKeyBindingPosition)
     {
         return new AncestorLookup_Nested(group, rowType, ancestorTypes, hKeyBindingPosition);
@@ -329,7 +328,7 @@
     public static Operator indexScan_Default(IndexRowType indexType,
                                              boolean reverse,
                                              IndexKeyRange indexKeyRange,
-                                             UserTableRowType innerJoinUntilRowType)
+                                             TableRowType innerJoinUntilRowType)
     {
         Ordering ordering = new Ordering();
         int fields = indexType.nFields();
@@ -372,13 +371,13 @@
     public static Operator indexScan_Default(IndexRowType indexType,
                                              IndexKeyRange indexKeyRange,
                                              Ordering ordering,
-                                             UserTableRowType innerJoinUntilRowType)
+                                             TableRowType innerJoinUntilRowType)
     {
         return indexScan_Default(indexType,
                                  indexKeyRange,
                                  ordering,
                                  IndexScanSelector.leftJoinAfter(indexType.index(),
-                                                                 innerJoinUntilRowType.userTable()));
+                                                                 innerJoinUntilRowType.table()));
     }
 
     public static Operator indexScan_Default(IndexRowType indexType,
@@ -436,7 +435,7 @@
     public static Operator product_NestedLoops(Operator outerInput,
                                                        Operator innerInput,
                                                        RowType outerType,
-                                                       UserTableRowType branchType,
+                                                       TableRowType branchType,
                                                        RowType innerType,
                                                        int inputBindingPosition)
     {
@@ -596,7 +595,7 @@
                                              RowType leftRowType, RowType rightRowType,
                                              int leftOrderingFields, int rightOrderingFields,
                                              int comparisonFields,
-                                             UserTableRowType outputHKeyTableRowType)
+                                             TableRowType outputHKeyTableRowType)
     {
         return new HKeyUnion_Ordered(leftInput, rightInput,
                                      leftRowType, rightRowType,

=== modified file 'src/main/java/com/akiban/qp/operator/AncestorLookup_Default.java'
--- src/main/java/com/akiban/qp/operator/AncestorLookup_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/AncestorLookup_Default.java	2013-05-28 23:28:27 +0000
@@ -18,14 +18,14 @@
 package com.akiban.qp.operator;
 
 import com.akiban.ais.model.Group;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.qp.row.HKey;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.rowtype.HKeyRowType;
 import com.akiban.qp.rowtype.IndexRowType;
 import com.akiban.qp.rowtype.RowType;
 import com.akiban.qp.rowtype.Schema;
-import com.akiban.qp.rowtype.UserTableRowType;
+import com.akiban.qp.rowtype.TableRowType;
 import com.akiban.server.explain.*;
 import com.akiban.server.explain.std.LookUpOperatorExplainer;
 import com.akiban.util.ArgumentValidation;
@@ -65,7 +65,7 @@
  <li><b>RowType rowType:</b> Ancestors will be located for input rows
  of this type.
 
- <li><b>Collection<UserTableRowType> ancestorTypes:</b> Ancestor types to be located.
+ <li><b>Collection<TableRowType> ancestorTypes:</b> Ancestor types to be located.
 
  <li><b>API.InputPreservationOption flag:</b> Indicates whether rows of type rowType
  will be preserved in the output stream (flag = KEEP_INPUT), or
@@ -155,7 +155,7 @@
     public AncestorLookup_Default(Operator inputOperator,
                                   Group group,
                                   RowType rowType,
-                                  Collection<UserTableRowType> ancestorTypes,
+                                  Collection<TableRowType> ancestorTypes,
                                   API.InputPreservationOption flag)
     {
         validateArguments(rowType, ancestorTypes, flag);
@@ -165,15 +165,15 @@
         this.keepInput = flag == API.InputPreservationOption.KEEP_INPUT;
         // Sort ancestor types by depth
         this.ancestors = new ArrayList<>(ancestorTypes.size());
-        for (UserTableRowType ancestorType : ancestorTypes) {
-            this.ancestors.add(ancestorType.userTable());
+        for (TableRowType ancestorType : ancestorTypes) {
+            this.ancestors.add(ancestorType.table());
         }
         if (this.ancestors.size() > 1) {
             Collections.sort(this.ancestors,
-                             new Comparator<UserTable>()
+                             new Comparator<Table>()
                              {
                                  @Override
-                                 public int compare(UserTable x, UserTable y)
+                                 public int compare(Table x, Table y)
                                  {
                                      return x.getDepth() - y.getDepth();
                                  }
@@ -183,7 +183,7 @@
     
     // For use by this class
 
-    private void validateArguments(RowType rowType, Collection<UserTableRowType> ancestorTypes, API.InputPreservationOption flag)
+    private void validateArguments(RowType rowType, Collection<TableRowType> ancestorTypes, API.InputPreservationOption flag)
     {
         ArgumentValidation.notEmpty("ancestorTypes", ancestorTypes);
         if (rowType instanceof IndexRowType) {
@@ -193,13 +193,13 @@
             RowType tableRowType = ((IndexRowType) rowType).tableType();
             // Each ancestorType must be an ancestor of rowType. ancestorType = tableRowType is OK only if the input
             // is from an index. I.e., this operator can be used for an index lookup.
-            for (UserTableRowType ancestorType : ancestorTypes) {
+            for (TableRowType ancestorType : ancestorTypes) {
                 ArgumentValidation.isTrue("ancestorType.ancestorOf(tableRowType)",
                                           ancestorType.ancestorOf(tableRowType));
-                ArgumentValidation.isTrue("ancestorType.userTable().getGroup() == tableRowType.userTable().getGroup()",
-                                          ancestorType.userTable().getGroup() == tableRowType.userTable().getGroup());
+                ArgumentValidation.isTrue("ancestorType.table().getGroup() == tableRowType.table().getGroup()",
+                                          ancestorType.table().getGroup() == tableRowType.table().getGroup());
             }
-        } else if (rowType instanceof UserTableRowType) {
+        } else if (rowType instanceof TableRowType) {
             // Each ancestorType must be an ancestor of rowType. ancestorType = tableRowType is OK only if the input
             // is from an index. I.e., this operator can be used for an index lookup.
             for (RowType ancestorType : ancestorTypes) {
@@ -207,19 +207,19 @@
                                           ancestorType != rowType);
                 ArgumentValidation.isTrue("ancestorType.ancestorOf(tableRowType)",
                                           ancestorType.ancestorOf(rowType));
-                ArgumentValidation.isTrue("ancestorType.userTable().getGroup() == tableRowType.userTable().getGroup()",
-                                          ancestorType.userTable().getGroup() == rowType.userTable().getGroup());
+                ArgumentValidation.isTrue("ancestorType.table().getGroup() == tableRowType.table().getGroup()",
+                                          ancestorType.table().getGroup() == rowType.table().getGroup());
             }
         } else if (rowType instanceof HKeyRowType) {
             ArgumentValidation.isTrue("flag == API.InputPreservationOption.DISCARD_INPUT",
                                       flag == API.InputPreservationOption.DISCARD_INPUT);
-            for (UserTableRowType ancestorType : ancestorTypes) {
+            for (TableRowType ancestorType : ancestorTypes) {
                 HKeyRowType hKeyRowType = (HKeyRowType) rowType;
-                UserTableRowType tableRowType = ancestorType.schema().userTableRowType(hKeyRowType.hKey().userTable());
+                TableRowType tableRowType = ancestorType.schema().tableRowType(hKeyRowType.hKey().table());
                 ArgumentValidation.isTrue("ancestorType.ancestorOf(tableRowType)",
                                           ancestorType.ancestorOf(tableRowType));
-                ArgumentValidation.isTrue("ancestorType.userTable().getGroup() == tableRowType.userTable().getGroup()",
-                                          ancestorType.userTable().getGroup() == tableRowType.userTable().getGroup());
+                ArgumentValidation.isTrue("ancestorType.table().getGroup() == tableRowType.table().getGroup()",
+                                          ancestorType.table().getGroup() == tableRowType.table().getGroup());
             }
         } else {
             ArgumentValidation.isTrue("invalid rowType", false);
@@ -237,15 +237,15 @@
     private final Operator inputOperator;
     private final Group group;
     private final RowType rowType;
-    private final List<UserTable> ancestors;
+    private final List<Table> ancestors;
     private final boolean keepInput;
 
     @Override
     public CompoundExplainer getExplainer(ExplainContext context)
     {
         Attributes atts = new Attributes();
-        for (UserTable table : ancestors) {
-            atts.put(Label.OUTPUT_TYPE, ((Schema)rowType.schema()).userTableRowType(table).getExplainer(context));
+        for (Table table : ancestors) {
+            atts.put(Label.OUTPUT_TYPE, ((Schema)rowType.schema()).tableRowType(table).getExplainer(context));
         }
         return new LookUpOperatorExplainer(getName(), atts, rowType, keepInput, inputOperator, context);
     }

=== modified file 'src/main/java/com/akiban/qp/operator/AncestorLookup_Nested.java'
--- src/main/java/com/akiban/qp/operator/AncestorLookup_Nested.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/AncestorLookup_Nested.java	2013-05-28 23:28:27 +0000
@@ -18,14 +18,14 @@
 package com.akiban.qp.operator;
 
 import com.akiban.ais.model.Group;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.qp.row.HKey;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.rowtype.HKeyRowType;
 import com.akiban.qp.rowtype.IndexRowType;
 import com.akiban.qp.rowtype.RowType;
 import com.akiban.qp.rowtype.Schema;
-import com.akiban.qp.rowtype.UserTableRowType;
+import com.akiban.qp.rowtype.TableRowType;
 import com.akiban.server.explain.*;
 import com.akiban.server.explain.std.LookUpOperatorExplainer;
 import com.akiban.util.ArgumentValidation;
@@ -144,7 +144,7 @@
 
     public AncestorLookup_Nested(Group group,
                                  RowType rowType,
-                                 Collection<UserTableRowType> ancestorTypes,
+                                 Collection<TableRowType> ancestorTypes,
                                  int inputBindingPosition)
     {
         validateArguments(group, rowType, ancestorTypes, inputBindingPosition);
@@ -153,15 +153,15 @@
         this.inputBindingPosition = inputBindingPosition;
         // Sort ancestor types by depth
         this.ancestors = new ArrayList<>(ancestorTypes.size());
-        for (UserTableRowType ancestorType : ancestorTypes) {
-            this.ancestors.add(ancestorType.userTable());
+        for (TableRowType ancestorType : ancestorTypes) {
+            this.ancestors.add(ancestorType.table());
         }
         if (this.ancestors.size() > 1) {
             Collections.sort(this.ancestors,
-                             new Comparator<UserTable>()
+                             new Comparator<Table>()
                              {
                                  @Override
-                                 public int compare(UserTable x, UserTable y)
+                                 public int compare(Table x, Table y)
                                  {
                                      return x.getDepth() - y.getDepth();
                                  }
@@ -189,10 +189,10 @@
             for (RowType ancestorType : ancestorTypes) {
                 ArgumentValidation.isTrue("ancestorType.ancestorOf(tableRowType)",
                                           ancestorType.ancestorOf(tableRowType));
-                ArgumentValidation.isTrue("ancestorType.userTable().getGroup() == tableRowType.userTable().getGroup()",
-                                          ancestorType.userTable().getGroup() == tableRowType.userTable().getGroup());
+                ArgumentValidation.isTrue("ancestorType.table().getGroup() == tableRowType.table().getGroup()",
+                                          ancestorType.table().getGroup() == tableRowType.table().getGroup());
             }
-        } else if (rowType instanceof UserTableRowType) {
+        } else if (rowType instanceof TableRowType) {
             // Each ancestorType must be an ancestor of rowType. ancestorType = tableRowType is OK only if the input
             // is from an index. I.e., this operator can be used for an index lookup.
             for (RowType ancestorType : ancestorTypes) {
@@ -200,8 +200,8 @@
                                           ancestorType != rowType);
                 ArgumentValidation.isTrue("ancestorType.ancestorOf(tableRowType)",
                                           ancestorType.ancestorOf(rowType));
-                ArgumentValidation.isTrue("ancestorType.userTable().getGroup() == tableRowType.userTable().getGroup()",
-                                          ancestorType.userTable().getGroup() == rowType.userTable().getGroup());
+                ArgumentValidation.isTrue("ancestorType.table().getGroup() == tableRowType.table().getGroup()",
+                                          ancestorType.table().getGroup() == rowType.table().getGroup());
             }
         } else if (rowType instanceof HKeyRowType) {
         } else {
@@ -219,7 +219,7 @@
 
     private final Group group;
     private final RowType rowType;
-    private final List<UserTable> ancestors;
+    private final List<Table> ancestors;
     private final int inputBindingPosition;
 
     @Override
@@ -227,8 +227,8 @@
     {
         Attributes atts = new Attributes();
         atts.put(Label.BINDING_POSITION, PrimitiveExplainer.getInstance(inputBindingPosition));
-        for (UserTable table : ancestors) {
-            atts.put(Label.OUTPUT_TYPE, ((Schema)rowType.schema()).userTableRowType(table).getExplainer(context));
+        for (Table table : ancestors) {
+            atts.put(Label.OUTPUT_TYPE, ((Schema)rowType.schema()).tableRowType(table).getExplainer(context));
         }
         return new LookUpOperatorExplainer(getName(), atts, rowType, false, null, context);
     }

=== modified file 'src/main/java/com/akiban/qp/operator/BranchLookup_Default.java'
--- src/main/java/com/akiban/qp/operator/BranchLookup_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/BranchLookup_Default.java	2013-05-28 23:28:27 +0000
@@ -18,13 +18,13 @@
 package com.akiban.qp.operator;
 
 import com.akiban.ais.model.Group;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.qp.row.HKey;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.rowtype.IndexRowType;
 import com.akiban.qp.rowtype.*;
 import com.akiban.qp.rowtype.RowType;
-import com.akiban.qp.rowtype.UserTableRowType;
+import com.akiban.qp.rowtype.TableRowType;
 import com.akiban.server.explain.*;
 import com.akiban.server.explain.std.LookUpOperatorExplainer;
 import com.akiban.util.ArgumentValidation;
@@ -67,7 +67,7 @@
  discarded (flag = DISCARD_INPUT).
 
  <li><b>Limit limit (DEPRECATED):</b> A limit on the number of rows to
- be returned. The limit is specific to one UserTable. Deprecated
+ be returned. The limit is specific to one Table. Deprecated
  because the result is not well-defined. In the case of a branching
  group, a limit on one sibling has impliciations on the return of rows
  of other siblings.
@@ -186,7 +186,7 @@
     public BranchLookup_Default(Operator inputOperator,
                                 Group group,
                                 RowType inputRowType,
-                                UserTableRowType outputRowType,
+                                TableRowType outputRowType,
                                 API.InputPreservationOption flag,
                                 Limit limit)
     {
@@ -194,20 +194,20 @@
         ArgumentValidation.notNull("outputRowType", outputRowType);
         ArgumentValidation.notNull("limit", limit);
         ArgumentValidation.isTrue("outputRowType != inputRowType", outputRowType != inputRowType);
-        ArgumentValidation.isTrue("inputRowType instanceof UserTableRowType || flag == API.InputPreservationOption.DISCARD_INPUT",
-                                  inputRowType instanceof UserTableRowType || flag == API.InputPreservationOption.DISCARD_INPUT);
-        UserTableRowType inputTableType = null;
-        if (inputRowType instanceof UserTableRowType) {
-            inputTableType = (UserTableRowType) inputRowType;
+        ArgumentValidation.isTrue("inputRowType instanceof TableRowType || flag == API.InputPreservationOption.DISCARD_INPUT",
+                                  inputRowType instanceof TableRowType || flag == API.InputPreservationOption.DISCARD_INPUT);
+        TableRowType inputTableType = null;
+        if (inputRowType instanceof TableRowType) {
+            inputTableType = (TableRowType) inputRowType;
         } else if (inputRowType instanceof IndexRowType) {
             inputTableType = ((IndexRowType) inputRowType).tableType();
         } else if (inputRowType instanceof HKeyRowType) {
             Schema schema = outputRowType.schema();
-            inputTableType = schema.userTableRowType(inputRowType.hKey().userTable());
+            inputTableType = schema.tableRowType(inputRowType.hKey().table());
         }
         assert inputTableType != null : inputRowType;
-        UserTable inputTable = inputTableType.userTable();
-        UserTable outputTable = outputRowType.userTable();
+        Table inputTable = inputTableType.table();
+        Table outputTable = outputRowType.table();
         ArgumentValidation.isSame("inputTable.getGroup()",
                                   inputTable.getGroup(),
                                   "outputTable.getGroup()",
@@ -242,7 +242,7 @@
             this.inputPrecedesBranch = true;
         } else {
             // neither input type nor output type is the common ancestor
-            UserTable ancestorOfInputAndChildOfCommon = inputTable;
+            Table ancestorOfInputAndChildOfCommon = inputTable;
             while (ancestorOfInputAndChildOfCommon.parentTable() != commonAncestor) {
                 ancestorOfInputAndChildOfCommon = ancestorOfInputAndChildOfCommon.parentTable();
             }
@@ -252,14 +252,14 @@
 
     // For use by this class
 
-    private static UserTable commonAncestor(UserTable inputTable, UserTable outputTable)
+    private static Table commonAncestor(Table inputTable, Table outputTable)
     {
         int minLevel = min(inputTable.getDepth(), outputTable.getDepth());
-        UserTable inputAncestor = inputTable;
+        Table inputAncestor = inputTable;
         while (inputAncestor.getDepth() > minLevel) {
             inputAncestor = inputAncestor.parentTable();
         }
-        UserTable outputAncestor = outputTable;
+        Table outputAncestor = outputTable;
         while (outputAncestor.getDepth() > minLevel) {
             outputAncestor = outputAncestor.parentTable();
         }
@@ -281,11 +281,11 @@
     private final Operator inputOperator;
     private final Group group;
     private final RowType inputRowType;
-    private final UserTableRowType outputRowType;
+    private final TableRowType outputRowType;
     private final boolean keepInput;
     // If keepInput is true, inputPrecedesBranch controls whether input row appears before the retrieved branch.
     private final boolean inputPrecedesBranch;
-    private final UserTable commonAncestor;
+    private final Table commonAncestor;
     private final int branchRootOrdinal;
     private final Limit limit;
 
@@ -294,7 +294,7 @@
     {
         Attributes atts = new Attributes();
         atts.put(Label.OUTPUT_TYPE, outputRowType.getExplainer(context));
-        UserTableRowType ancestorRowType = outputRowType.schema().userTableRowType(commonAncestor);
+        TableRowType ancestorRowType = outputRowType.schema().tableRowType(commonAncestor);
         if ((ancestorRowType != inputRowType) && (ancestorRowType != outputRowType))
             atts.put(Label.ANCESTOR_TYPE, ancestorRowType.getExplainer(context));
         return new LookUpOperatorExplainer(getName(), atts, inputRowType, keepInput, inputOperator, context);

=== modified file 'src/main/java/com/akiban/qp/operator/BranchLookup_Nested.java'
--- src/main/java/com/akiban/qp/operator/BranchLookup_Nested.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/BranchLookup_Nested.java	2013-05-28 23:28:27 +0000
@@ -18,12 +18,12 @@
 package com.akiban.qp.operator;
 
 import com.akiban.ais.model.Group;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.qp.row.HKey;
 import com.akiban.qp.row.Row;
 import com.akiban.qp.rowtype.IndexRowType;
 import com.akiban.qp.rowtype.RowType;
-import com.akiban.qp.rowtype.UserTableRowType;
+import com.akiban.qp.rowtype.TableRowType;
 import com.akiban.qp.rowtype.*;
 import com.akiban.server.explain.*;
 import com.akiban.server.explain.std.LookUpOperatorExplainer;
@@ -59,10 +59,10 @@
  <li><b>RowType inputRowType:</b> Branches will be located for input
  rows of this type.
  
- <li><b>UserTableRowType ancestorRowType:</b> Identifies the table in the group at which branching occurs.
+ <li><b>TableRowType ancestorRowType:</b> Identifies the table in the group at which branching occurs.
  Must be an ancestor of both inputRowType's table and outputRowType's table.
 
- <li><b>UserTableRowType outputRowType:</b> Type at the root of the branch to be
+ <li><b>TableRowType outputRowType:</b> Type at the root of the branch to be
  retrieved.
 
  <li><b>API.InputPreservationOption flag:</b> Indicates whether rows of type rowType
@@ -74,8 +74,8 @@
 
  </ul>
 
- inputRowType may be an index row type, a user table row type, or an hkey row type. flag = KEEP_INPUT is permitted
- only for user table row types.
+ inputRowType may be an index row type, a table row type, or an hkey row type. flag = KEEP_INPUT is permitted
+ only for table row types.
 
  The groupTable, inputRowType, and outputRowType must belong to the
  same group.
@@ -163,8 +163,8 @@
 
     public BranchLookup_Nested(Group group,
                                RowType inputRowType,
-                               UserTableRowType ancestorRowType,
-                               UserTableRowType outputRowType,
+                               TableRowType ancestorRowType,
+                               TableRowType outputRowType,
                                API.InputPreservationOption flag,
                                int inputBindingPosition)
     {
@@ -172,21 +172,21 @@
         ArgumentValidation.notNull("inputRowType", inputRowType);
         ArgumentValidation.notNull("outputRowType", outputRowType);
         ArgumentValidation.notNull("flag", flag);
-        ArgumentValidation.isTrue("inputRowType instanceof UserTableRowType || flag == API.InputPreservationOption.DISCARD_INPUT",
-                                  inputRowType instanceof UserTableRowType || flag == API.InputPreservationOption.DISCARD_INPUT);
+        ArgumentValidation.isTrue("inputRowType instanceof TableRowType || flag == API.InputPreservationOption.DISCARD_INPUT",
+                                  inputRowType instanceof TableRowType || flag == API.InputPreservationOption.DISCARD_INPUT);
         ArgumentValidation.isGTE("hKeyBindingPosition", inputBindingPosition, 0);
-        UserTableRowType inputTableType = null;
-        if (inputRowType instanceof UserTableRowType) {
-            inputTableType = (UserTableRowType) inputRowType;
+        TableRowType inputTableType = null;
+        if (inputRowType instanceof TableRowType) {
+            inputTableType = (TableRowType) inputRowType;
         } else if (inputRowType instanceof IndexRowType) {
             inputTableType = ((IndexRowType) inputRowType).tableType();
         } else if (inputRowType instanceof HKeyRowType) {
             Schema schema = outputRowType.schema();
-            inputTableType = schema.userTableRowType(inputRowType.hKey().userTable());
+            inputTableType = schema.tableRowType(inputRowType.hKey().table());
         }
         assert inputTableType != null : inputRowType;
-        UserTable inputTable = inputTableType.userTable();
-        UserTable outputTable = outputRowType.userTable();
+        Table inputTable = inputTableType.table();
+        Table outputTable = outputRowType.table();
         ArgumentValidation.isSame("inputTable.getGroup()",
                                   inputTable.getGroup(),
                                   "outputTable.getGroup()",
@@ -199,7 +199,7 @@
         if (ancestorRowType == null) {
             this.commonAncestor = commonAncestor(inputTable, outputTable);
         } else {
-            this.commonAncestor = ancestorRowType.userTable();
+            this.commonAncestor = ancestorRowType.table();
             ArgumentValidation.isTrue("ancestorRowType.ancestorOf(inputTableType)",
                                       ancestorRowType.ancestorOf(inputTableType));
             ArgumentValidation.isTrue("ancestorRowType.ancestorOf(outputRowType)",
@@ -225,7 +225,7 @@
         } else if (inputTable == commonAncestor) {
             this.inputPrecedesBranch = true;
         } else {
-            UserTable ancestorOfInputAndChildOfCommon = inputTable;
+            Table ancestorOfInputAndChildOfCommon = inputTable;
             while (ancestorOfInputAndChildOfCommon.parentTable() != commonAncestor) {
                 ancestorOfInputAndChildOfCommon = ancestorOfInputAndChildOfCommon.parentTable();
             }
@@ -235,14 +235,14 @@
 
     // For use by this class
 
-    private static UserTable commonAncestor(UserTable inputTable, UserTable outputTable)
+    private static Table commonAncestor(Table inputTable, Table outputTable)
     {
         int minLevel = min(inputTable.getDepth(), outputTable.getDepth());
-        UserTable inputAncestor = inputTable;
+        Table inputAncestor = inputTable;
         while (inputAncestor.getDepth() > minLevel) {
             inputAncestor = inputAncestor.parentTable();
         }
-        UserTable outputAncestor = outputTable;
+        Table outputAncestor = outputTable;
         while (outputAncestor.getDepth() > minLevel) {
             outputAncestor = outputAncestor.parentTable();
         }
@@ -263,12 +263,12 @@
 
     private final Group group;
     private final RowType inputRowType;
-    private final UserTableRowType outputRowType;
+    private final TableRowType outputRowType;
     private final boolean keepInput;
     // If keepInput is true, inputPrecedesBranch controls whether input row appears before the retrieved branch.
     private final boolean inputPrecedesBranch;
     private final int inputBindingPosition;
-    private final UserTable commonAncestor;
+    private final Table commonAncestor;
     private final int branchRootOrdinal;
 
     @Override
@@ -277,7 +277,7 @@
         Attributes atts = new Attributes();
         atts.put(Label.BINDING_POSITION, PrimitiveExplainer.getInstance(inputBindingPosition));
         atts.put(Label.OUTPUT_TYPE, outputRowType.getExplainer(context));
-        UserTableRowType ancestorRowType = outputRowType.schema().userTableRowType(commonAncestor);
+        TableRowType ancestorRowType = outputRowType.schema().tableRowType(commonAncestor);
         if ((ancestorRowType != inputRowType) && (ancestorRowType != outputRowType))
             atts.put(Label.ANCESTOR_TYPE, ancestorRowType.getExplainer(context));
         return new LookUpOperatorExplainer(getName(), atts, inputRowType, false, null, context);

=== modified file 'src/main/java/com/akiban/qp/operator/Count_TableStatus.java'
--- src/main/java/com/akiban/qp/operator/Count_TableStatus.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Count_TableStatus.java	2013-05-28 23:28:27 +0000
@@ -21,7 +21,7 @@
 import com.akiban.qp.row.Row;
 import com.akiban.qp.row.ValuesRow;
 import com.akiban.qp.rowtype.RowType;
-import com.akiban.qp.rowtype.UserTableRowType;
+import com.akiban.qp.rowtype.TableRowType;
 import com.akiban.qp.rowtype.ValuesRowType;
 import com.akiban.server.explain.CompoundExplainer;
 import com.akiban.server.explain.ExplainContext;
@@ -108,8 +108,8 @@
     public Count_TableStatus(RowType tableType, boolean usePValues)
     {
         ArgumentValidation.notNull("tableType", tableType);
-        ArgumentValidation.isTrue("tableType instanceof UserTableRowType",
-                                  tableType instanceof UserTableRowType);
+        ArgumentValidation.isTrue("tableType instanceof TableRowType",
+                                  tableType instanceof TableRowType);
         this.tableType = tableType;
         this.resultType = usePValues
                 ? tableType.schema().newValuesType(MNumeric.BIGINT.instance(false))

=== modified file 'src/main/java/com/akiban/qp/operator/Delete_Default.java'
--- src/main/java/com/akiban/qp/operator/Delete_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Delete_Default.java	2013-05-28 23:28:27 +0000
@@ -70,7 +70,7 @@
  of the same RowType.
 
  The Delete_Default operator assumes (and requires) the input row types
- be of a UserTableRowType, and not any derived type. This can't be
+ be of a TableRowType, and not any derived type. This can't be
  enforced by the constructor because <i>PhysicalOperator#rowType()</i>
  isn't implemented for all operators.
 

=== modified file 'src/main/java/com/akiban/qp/operator/Delete_Returning.java'
--- src/main/java/com/akiban/qp/operator/Delete_Returning.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/Delete_Returning.java	2013-05-28 23:28:27 +0000
@@ -64,7 +64,7 @@
 of the same RowType.
 
 The Delete_Returning operator assumes (and requires) the input row types
-be of a UserTableRowType, and not any derived type. This can't be
+be of a TableRowType, and not any derived type. This can't be
 enforced by the constructor because <i>PhysicalOperator#rowType()</i>
 isn't implemented for all operators.
 

=== modified file 'src/main/java/com/akiban/qp/operator/ExecutionBase.java'
--- src/main/java/com/akiban/qp/operator/ExecutionBase.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/ExecutionBase.java	2013-05-28 23:28:27 +0000
@@ -17,7 +17,7 @@
 
 package com.akiban.qp.operator;
 
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 
 public abstract class ExecutionBase
 {
@@ -26,7 +26,7 @@
         return context.getStore();
     }
 
-    protected StoreAdapter adapter(UserTable name)
+    protected StoreAdapter adapter(Table name)
     {
         return context.getStore(name);
     }

=== modified file 'src/main/java/com/akiban/qp/operator/Flatten_HKeyOrdered.java'
--- src/main/java/com/akiban/qp/operator/Flatten_HKeyOrdered.java	2013-05-24 21:45:54 +0000
+++ src/main/java/com/akiban/qp/operator/Flatten_HKeyOrdered.java	2013-05-28 23:28:27 +0000
@@ -235,7 +235,7 @@
         List<HKeySegment> childHKeySegments = childType.hKey().segments();
         HKeySegment lastChildHKeySegment = childHKeySegments.get(childHKeySegments.size() - 1);
         RowDef childRowDef = lastChildHKeySegment.table().rowDef();
-        this.childOrdinal = childRowDef.userTable().getOrdinal();
+        this.childOrdinal = childRowDef.table().getOrdinal();
         this.nChildHKeySegmentFields = lastChildHKeySegment.columns().size();
         this.parentHKeySegments = parentType.hKey().segments().size();
     }

=== modified file 'src/main/java/com/akiban/qp/operator/GroupScan_Default.java'
--- src/main/java/com/akiban/qp/operator/GroupScan_Default.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/GroupScan_Default.java	2013-05-28 23:28:27 +0000
@@ -19,7 +19,7 @@
 
 import com.akiban.ais.model.Group;
 import com.akiban.ais.model.TableName;
-import com.akiban.ais.model.UserTable;
+import com.akiban.ais.model.Table;
 import com.akiban.qp.row.HKey;
 import com.akiban.qp.row.Row;
 import com.akiban.server.explain.*;
@@ -42,7 +42,7 @@
  The group table to be scanned.
 
  <li><b>Limit limit (DEPRECATED):</b>
- A limit on the number of rows to be returned. The limit is specific to one UserTable.
+ A limit on the number of rows to be returned. The limit is specific to one Table.
  Deprecated because the result is not well-defined. In the case of a branching group, a
  limit on one sibling has impliciations on the return of rows of other siblings.
 
@@ -296,8 +296,8 @@
         PositionalGroupCursorCreator(Group group,
                                      int hKeyBindingPosition,
                                      boolean deep,
-                                     UserTable hKeyType,
-                                     UserTable shortenUntil)
+                                     Table hKeyType,
+                                     Table shortenUntil)
         {
             super(group);
             this.hKeyBindingPosition = hKeyBindingPosition;
@@ -325,8 +325,8 @@
 
         private final int hKeyBindingPosition;
         private final boolean deep;
-        private final UserTable shortenUntil;
-        private final UserTable hKeyType;
+        private final Table shortenUntil;
+        private final Table hKeyType;
     }
 
     private static class HKeyBoundCursor extends ChainedCursor
@@ -370,8 +370,8 @@
                         GroupCursor input,
                         int hKeyBindingPosition,
                         boolean deep,
-                        UserTable hKeyType,
-                        UserTable shortenUntil)
+                        Table hKeyType,
+                        Table shortenUntil)
         {
             super(context, input);
             this.input = input;
@@ -388,8 +388,8 @@
         private final GroupCursor input;
         private final int hKeyBindingPosition;
         private final boolean deep;
-        private UserTable atTable;
-        private final UserTable stopSearchTable;
+        private Table atTable;
+        private final Table stopSearchTable;
         private boolean sawOne = false;
     }
 }

=== modified file 'src/main/java/com/akiban/qp/operator/HKeyUnion_Ordered.java'
--- src/main/java/com/akiban/qp/operator/HKeyUnion_Ordered.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/qp/operator/HKeyUnion_Ordered.java	2013-05-28 23:28:27 +0000
@@ -22,7 +22,7 @@
 import com.akiban.qp.row.Row;
 import com.akiban.qp.rowtype.HKeyRowType;
 import com.akiban.qp.rowtype.RowType;
-import com.akiban.qp.rowtype.UserTableRowType;
+import com.akiban.qp.rowtype.TableRowType;
 import com.akiban.qp.util.HKeyCache;
 import com.akiban.server.explain.*;
 import com.akiban.server.types.util.ValueSources;
@@ -55,7 +55,7 @@
 <li><b>int leftOrderingFields:</b> Number of trailing fields of left input rows to be used for ordering and matching rows.
 <li><b>int rightOrderingFields:</b> Number of trailing fields of right input rows to be used for ordering and matching rows.
 <li><b>int comparisonFields:</b> Number of ordering fields to be compared.
-<li><b>UserTableRowType outputHKeyTableRowType:</b> Before eliminating duplicate hkeys, hkeys from the input stream
+<li><b>TableRowType outputHKeyTableRowType:</b> Before eliminating duplicate hkeys, hkeys from the input stream
  are shortened to match <tt>outputHKeyTableRowType</tt>'s table's hkey type.
 
  <h1>Behavior</h1>
@@ -128,7 +128,7 @@
                              int leftOrderingFields,
                              int rightOrderingFields,
                              int comparisonFields,
-                             UserTableRowType outputHKeyTableRowType)
+                             TableRowType outputHKeyTableRowType)
     {
         ArgumentValidation.notNull("left", left);
         ArgumentValidation.notNull("right", right);
@@ -149,7 +149,7 @@
         this.advanceLeftOnMatch = leftOrderingFields >= rightOrderingFields;
         this.advanceRightOnMatch = rightOrderingFields >= leftOrderingFields;
         this.outputHKeyTableRowType = outputHKeyTableRowType;
-        com.akiban.ais.model.HKey outputHKeyDefinition = outputHKeyTableRowType.userTable().hKey();
+        com.akiban.ais.model.HKey outputHKeyDefinition = outputHKeyTableRowType.table().hKey();
         this.outputHKeyRowType = outputHKeyTableRowType.schema().newHKeyRowType(outputHKeyDefinition);
         this.outputHKeySegments = outputHKeyDefinition.segments().size();
         // Setup for row comparisons
@@ -174,7 +174,7 @@
     private final RankExpressions fieldRankingExpressions;
     private final boolean advanceLeftOnMatch;
     private final boolean advanceRightOnMatch;
-    private final UserTableRowType outputHKeyTableRowType;
+    private final TableRowType outputHKeyTableRowType;