renamed some constants