Fixed mismatch of names and rewrites for possible-rewrites
Merge branch 'master' of https://github.com/ku-fpg/hermit