Renamed some Waterston and White conf files