Updated some data handling for bundle naming