rename some more functions, remove extraneous commented out code

git-svn-id: file:///svn/mysql/tokudb-engine/src@11087 c7de825b-a66e-492c-adef-691d508d4ae1