- renamed some constants/variables