Naming changes for droid2we