Renamed some of the waf bld.program's