Merge "Rename symbols to be more consistent"