Table rename

Change a few table names around for consistency,

Not backward-compatible change, the table names in an existing database will have to be renamed manually.