rename some varialbes
turn off TestHorizontalSearch_SSE41 unit test becasue of random issues
Merge pull request #712 from ruil2/enc_rename_1

rename some varialbes