Address comments from CR, change header name to reflect latest version