Updated table names

Had inconsistent table names.