Tablenames

Note that this incorporates the contents of #60, which should be merged in quickly first.