CodeHacker: avoid shadowed variable name
DiffView: use upper case for constants