adapted package and classname to latest version