Frans - you blew me away today because when I initially created my database, I decided to try naming them all hungarian case table names, but later decided I hated it. So, I went through and renamed all with underscores. I was dreading all the errors I would get when I refreshed the catalog - but was pleasantly surprised. It actually figured out that I had renamed the entities and remapped things accordingly! Brilliant! Do you stored the obj_id somehow and map to that?