Updated clir minhash code and some class renaming cleanup