modify some class name for common use.