renamed some defines