modify the versions and rename some class