Fix sitesettings to use the new data names