Changed site names so we can stop hardcoding site names in asset-service
merge conflicts