Do some name refine and add comments