More changes to names and site info