rename package, add gdm support