Changing message intent strings to Constant..