Merge "Rename ErrorCode"