rename for amalgamation
Merge pull request #255 from jdeng/rename_for_amalgamation

rename for amalgamation