Fix namespacing issue with table names