Update constant IDENTIFIER to use short class name instead of fully qual...

...ified one