changed names for some constants