Renamed dialog objects to make them more generic.