Merge "Rename recently added symbols to camel-case"