Adding index name for unique tokens

Fix for naming convention to be compatible with the older version.