Switched unique name test to library wide command for performance