Bugfixing:

- fixed TODO for matching names of objects
- removed some UBLs