Connection: forgot to commit name change
Droid: check should happen after move, not before