diff --git a/cmake/backbone b/cmake/backbone
index 02f3a0f..e94a91b 160000
--- a/cmake/backbone
+++ b/cmake/backbone
@@ -1 +1 @@
-Subproject commit 02f3a0f7d969534872799b45a95d3c5a6fef14c3
+Subproject commit e94a91ba7e5e1ef21b2040e1cacb957100d435be
diff --git a/test/plugins/typeA/typeA1/CMakeLists.txt b/test/plugins/typeA/typeA1/CMakeLists.txt
index c7e5227..e2d3f88 100644
--- a/test/plugins/typeA/typeA1/CMakeLists.txt
+++ b/test/plugins/typeA/typeA1/CMakeLists.txt
@@ -1,11 +1,13 @@
-SET (PluginName type_a1)
-FILE (GLOB_RECURSE PluginSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeA1.vala)
-SET (PluginCustomVapis
+SET (LibName type_a1)
+SET (LibIsPlugin ON)
+SET (LibNoApi ON)
+FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeA1.vala)
+SET (LibCustomVapis
     ${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
     ${CMAKE_BINARY_DIR}/test/loader_test-iface/loader_test-iface-${MAJOR}.vapi
 )
-SET (PluginLinkLibs gobject-plugin-iface loader_test-iface)
+SET (LibLinkLibs gobject-plugin-iface loader_test-iface)
 INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface"
                      "${CMAKE_BINARY_DIR}/test/loader_test-iface"
 )
-INCLUDE (ValaPluginCommonRules)
+INCLUDE (ValaLibCommonRules)
diff --git a/test/plugins/typeA/typeA2/CMakeLists.txt b/test/plugins/typeA/typeA2/CMakeLists.txt
index 97450f6..d56eb9d 100644
--- a/test/plugins/typeA/typeA2/CMakeLists.txt
+++ b/test/plugins/typeA/typeA2/CMakeLists.txt
@@ -1,11 +1,13 @@
-SET (PluginName type_a2)
-FILE (GLOB_RECURSE PluginSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeA2.vala)
-SET (PluginCustomVapis
+SET (LibName type_a2)
+SET (LibIsPlugin ON)
+SET (LibNoApi ON)
+FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeA2.vala)
+SET (LibCustomVapis
     ${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
     ${CMAKE_BINARY_DIR}/test/loader_test-iface/loader_test-iface-${MAJOR}.vapi
 )
-SET (PluginLinkLibs gobject-plugin-iface loader_test-iface)
+SET (LibLinkLibs gobject-plugin-iface loader_test-iface)
 INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface"
                      "${CMAKE_BINARY_DIR}/test/loader_test-iface"
 )
-INCLUDE (ValaPluginCommonRules)
+INCLUDE (ValaLibCommonRules)
diff --git a/test/plugins/typeB/typeB1/CMakeLists.txt b/test/plugins/typeB/typeB1/CMakeLists.txt
index fbbd5ec..857df1c 100644
--- a/test/plugins/typeB/typeB1/CMakeLists.txt
+++ b/test/plugins/typeB/typeB1/CMakeLists.txt
@@ -1,11 +1,13 @@
-SET (PluginName type_b1)
-FILE (GLOB_RECURSE PluginSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeB1.vala)
-SET (PluginCustomVapis
+SET (LibName type_b1)
+SET (LibIsPlugin ON)
+SET (LibNoApi ON)
+FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeB1.vala)
+SET (LibCustomVapis
     ${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
     ${CMAKE_BINARY_DIR}/test/loader_test-iface/loader_test-iface-${MAJOR}.vapi
 )
-SET (PluginLinkLibs gobject-plugin-iface loader_test-iface)
+SET (LibLinkLibs gobject-plugin-iface loader_test-iface)
 INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface"
                      "${CMAKE_BINARY_DIR}/test/loader_test-iface"
 )
-INCLUDE (ValaPluginCommonRules)
+INCLUDE (ValaLibCommonRules)
diff --git a/test/plugins/typeB/typeB2/CMakeLists.txt b/test/plugins/typeB/typeB2/CMakeLists.txt
index 655637d..1cda935 100644
--- a/test/plugins/typeB/typeB2/CMakeLists.txt
+++ b/test/plugins/typeB/typeB2/CMakeLists.txt
@@ -1,11 +1,13 @@
-SET (PluginName type_b2)
-FILE (GLOB_RECURSE PluginSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeB2.vala)
-SET (PluginCustomVapis
+SET (LibName type_b2)
+SET (LibIsPlugin ON)
+SET (LibNoApi ON)
+FILE (GLOB_RECURSE LibSources RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} TypeB2.vala)
+SET (LibCustomVapis
     ${CMAKE_BINARY_DIR}/src/iface/${PROJECT_LOWERCASE_NAME}-iface-${MAJOR}.vapi
     ${CMAKE_BINARY_DIR}/test/loader_test-iface/loader_test-iface-${MAJOR}.vapi
 )
-SET (PluginLinkLibs gobject-plugin-iface loader_test-iface)
+SET (LibLinkLibs gobject-plugin-iface loader_test-iface)
 INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}/src/iface"
                      "${CMAKE_BINARY_DIR}/test/loader_test-iface"
 )
-INCLUDE (ValaPluginCommonRules)
+INCLUDE (ValaLibCommonRules)