rename some classnames