rename constants, and add constant for 0