diff --git a/.appveyor.yml b/.appveyor.yml
index 982490c..1d4550d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -140,7 +140,7 @@ before_build:
 
 build_script:
   - cmd: cmake --build . --config "%configuration%" --target wepoll.dll
-  - cmd: cmake --build . --config "%configuration%" --target wepoll-combined.dll
+  - cmd: cmake --build . --config "%configuration%" --target wepoll-bundle.dll
 
 test_script:
   - cmd: cmake --build . --config "%configuration%" --target test-all
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b8c5e6..0f31cf2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ file(GLOB SOURCES_HEADER include/*.h)
 file(GLOB SOURCES_SRC src/*.c src/*.h)
 file(GLOB SOURCES_SRC_C src/*.c)
 file(GLOB SOURCES_SRC_REGULAR src/regular/*.c src/regular/*.h)
-file(GLOB SOURCES_SRC_COMBINED src/combined/*.c src/combined/*.h)
+file(GLOB SOURCES_SRC_BUNDLE src/bundle/*.c src/bundle/*.h)
 file(GLOB SOURCES_TEST test/*.c)
 file(GLOB SOURCES_TEST_SHARED test/shared/*.c test/shared/*.h)
 file(GLOB SOURCES_DOC LICENSE *.md)
@@ -30,36 +30,36 @@ file(GLOB SOURCES_DOC LICENSE *.md)
 get_filename_component(HEADER_NAME ${SOURCES_HEADER} NAME_WE)
 string(TOUPPER ${HEADER_NAME} HEADER_NAME_UC)
 
-set(COMBINED_HEADER "${DIST_DIR}/${HEADER_NAME}.h")
-set(COMBINED_SRC "${DIST_DIR}/${HEADER_NAME}.c")
+set(BUNDLE_HEADER "${DIST_DIR}/${HEADER_NAME}.h")
+set(BUNDLE_SRC "${DIST_DIR}/${HEADER_NAME}.c")
 set(DLL_NAME "${HEADER_NAME}")
-set(COMBINED_DLL_NAME "${HEADER_NAME}-combined")
+set(BUNDLE_DLL_NAME "${HEADER_NAME}-bundle")
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 source_group("" FILES ${SOURCES_HEADER})
 source_group(src FILES ${SOURCES_SRC})
 source_group(src FILES ${SOURCES_SRC_REGULAR})
-source_group(src FILES ${SOURCES_SRC_COMBINED})
+source_group(src FILES ${SOURCES_SRC_BUNDLE})
 source_group("" FILES ${SOURCES_TEST})
 source_group(test/shared FILES ${SOURCES_TEST_SHARED})
 source_group(doc FILES ${SOURCES_DOC})
-source_group(${DIST_DIR} FILES ${COMBINED_HEADER} ${COMBINED_SRC})
+source_group(${DIST_DIR} FILES ${BUNDLE_HEADER} ${BUNDLE_SRC})
 
 add_custom_command(
-  OUTPUT ${COMBINED_HEADER}
-  COMMAND node tools/combine.js ${SOURCES_HEADER} > ${COMBINED_HEADER}
+  OUTPUT ${BUNDLE_HEADER}
+  COMMAND node tools/combine.js ${SOURCES_HEADER} > ${BUNDLE_HEADER}
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   IMPLICIT_DEPENDS c ${SOURCES_HEADER}
 )
 
 add_custom_command(
-  OUTPUT ${COMBINED_SRC}
-  COMMAND node tools/combine.js -Iinclude -Isrc -Isrc/combined --strip-guards ${SOURCES_HEADER} ${SOURCES_SRC_C} > ${COMBINED_SRC}
+  OUTPUT ${BUNDLE_SRC}
+  COMMAND node tools/combine.js -Iinclude -Isrc -Isrc/bundle --strip-guards ${SOURCES_HEADER} ${SOURCES_SRC_C} > ${BUNDLE_SRC}
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  IMPLICIT_DEPENDS c ${SOURCES_HEADER} ${SOURCES_SRC} ${SOURCES_SRC_COMBINED}
+  IMPLICIT_DEPENDS c ${SOURCES_HEADER} ${SOURCES_SRC} ${SOURCES_SRC_BUNDLE}
 )
 
-add_custom_target(dist DEPENDS ${COMBINED_SRC} ${COMBINED_HEADER})
+add_custom_target(dist DEPENDS ${BUNDLE_SRC} ${BUNDLE_HEADER})
 file(MAKE_DIRECTORY ${DIST_DIR})
 add_custom_command(
   TARGET dist POST_BUILD
@@ -79,14 +79,14 @@ else()
 endif()
 set_target_properties(${DLL_TARGET} PROPERTIES OUTPUT_NAME ${DLL_NAME})
 
-set(COMBINED_DLL_TARGET "${COMBINED_DLL_NAME}.dll")
-add_library(${COMBINED_DLL_TARGET} SHARED ${COMBINED_HEADER} ${COMBINED_SRC})
+set(BUNDLE_DLL_TARGET "${BUNDLE_DLL_NAME}.dll")
+add_library(${BUNDLE_DLL_TARGET} SHARED ${BUNDLE_HEADER} ${BUNDLE_SRC})
 if(MSVC)
-  target_compile_definitions(${COMBINED_DLL_TARGET} PUBLIC "-D${HEADER_NAME_UC}_EXPORT=__declspec(dllexport)" )
+  target_compile_definitions(${BUNDLE_DLL_TARGET} PUBLIC "-D${HEADER_NAME_UC}_EXPORT=__declspec(dllexport)" )
 else()
-  target_compile_definitions(${COMBINED_DLL_TARGET} PUBLIC "-D${HEADER_NAME_UC}_EXPORT=__attribute__((visibility(\"default\")))")
+  target_compile_definitions(${BUNDLE_DLL_TARGET} PUBLIC "-D${HEADER_NAME_UC}_EXPORT=__attribute__((visibility(\"default\")))")
 endif()
-set_target_properties(${COMBINED_DLL_TARGET} PROPERTIES OUTPUT_NAME ${COMBINED_DLL_NAME})
+set_target_properties(${BUNDLE_DLL_TARGET} PROPERTIES OUTPUT_NAME ${BUNDLE_DLL_NAME})
 
 foreach(TEST_SOURCE ${SOURCES_TEST})
   get_filename_component(TEST_NAME ${TEST_SOURCE} NAME_WE)
diff --git a/src/combined/internal.h b/src/bundle/internal.h
similarity index 100%
rename from src/combined/internal.h
rename to src/bundle/internal.h