Incorporate feedback from Binder bundle renames

Good suggestions.