Added table name annotations.
Tidy.