Renamed some constants in system files