Added tablenames to a few classes.