Merge "Update naming of projet" into beijing