fix #608
rename some classes