refactore bundle naming