Fix #1071 - rename constants