renames to get rid of contextdroid