Rename file name and remove RFC3984 related comment code.