more fixes for cross-schema table name conflict, don't key by table name