r2d2 rename; working on droid parsing