revise function names and fix shut down order
revise a few data names in the private struct.