Can we rebase singular and plural table name?

[pmckernin]

look more specifically at singular_table_name and plural_table_name and see how they function with the draft generators. investigate where we can rebase.