Changed Define Names