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

...alified one