Rename button constants to something reasonable