Edited constants

Changed the names of some constants to make more since with NIM