HSEARCH-1712 Remove dependency to ParaNamer