Change to new database names.  Fix a couple of errors