Better naming bundle