Update and rename CarbonActivity.java to CmPlusActivity.java