rename some variable names which conflict with c++ keywords.
remove unused file