Merge "coresight: modify function names and messages"