Rename clashing symbols
Bump
Halvm changes.