fix bundle file name with underline
fix .xpt comment syntax at bottom line