A minor bit of refactoring. Transfer commands now work again after name changes.