Have tried to make "Qualify Less" for your tables in Catelog? By default tables in a category are fullly qualified. Here is the description about table qualification.
You can qualify tables in SQL queries to ensure your users access the correct tables.
You can use unqualified table names to control how selected tables are qualified in SQL queries. You can qualify tables with information on database, owner, table, and column. By default, tables are fully qualified.
You can remove the qualifiers for table names at any time.
Example
You have a catalog of sales data, containing one table called sales, that you are testing before releasing it to your end users. You qualify the table as <test>.<yourname>.<sales>, identifying the table as belonging to the test database and to the yourname owner. When you are ready to release the catalog, you remove the database and owner qualifiers to identify the table only as sales.