Rename and remove useless stuffs

Change-Id: I4d6de627cf3afa9319ba809f254eadb15ffb75b4
Signed-off-by: Bao Zhen <bz@infthink.com>