Merge "Rename "Bundle" to "Distro""