Merge "Update assets. Rename some of them for consistency"