Renamed some defines more consequente