Zhiqi: change figure names to solve conflict

pdflatex does not like figure names with extra dots.