Renamed temporary wheezy definitions