ifcodegen: Streamline the naming for the various input variables

All qmake variables which were previously prefixed with QFACE_ are now
prefixed with IFCODEGEN_ to match the new name of the generator and also
match the prf file name.

The --format argument of the generator (QFACE_FORMAT) will be renamed
to --template and the new qmake variable name is IFCODEGEN_TEMPLATE.

Change-Id: If5166091335bd12f71c82ffb93f9de3c6a60c92f
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

114 files changed, 375 insertions, 375 deletions

diff --git a/examples/interfaceframework/qface-if-addressbook/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-if-addressbook/backend_simulator/CMakeLists.txt
index 76292fd6..af0eb724 100644
--- a/examples/interfaceframework/qface-if-addressbook/backend_simulator/CMakeLists.txt
+++ b/examples/interfaceframework/qface-if-addressbook/backend_simulator/CMakeLists.txt
@@ -20,8 +20,8 @@ set_target_properties(addressbook_backend_simulator PROPERTIES LIBRARY_OUTPUT_DI
 
 # Interface Framework Generator:
 qt6_ifcodegen(addressbook_backend_simulator
-    QFACE_SOURCES ../example-if-addressbook.qface
-    QFACE_FORMAT backend_simulator
+    IFCODEGEN_SOURCES ../example-if-addressbook.qface
+    IFCODEGEN_TEMPLATE backend_simulator
 )
 
 target_link_libraries(addressbook_backend_simulator PUBLIC
diff --git a/examples/interfaceframework/qface-if-addressbook/backend_simulator/backend_simulator.pro b/examples/interfaceframework/qface-if-addressbook/backend_simulator/backend_simulator.pro
index ab022619..4dc8239b 100644
--- a/examples/interfaceframework/qface-if-addressbook/backend_simulator/backend_simulator.pro
+++ b/examples/interfaceframework/qface-if-addressbook/backend_simulator/backend_simulator.pro
@@ -11,8 +11,8 @@ INCLUDEPATH += $$OUT_PWD/../frontend
 QT += core interfaceframework
 CONFIG += ifcodegen plugin
 
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../example-if-addressbook.qface
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../example-if-addressbook.qface
 PLUGIN_TYPE = interfaceframework
 PLUGIN_CLASS_NAME = AddressBookSimulatorPlugin
 
diff --git a/examples/interfaceframework/qface-if-addressbook/frontend/CMakeLists.txt b/examples/interfaceframework/qface-if-addressbook/frontend/CMakeLists.txt
index f852990a..53b4b007 100644
--- a/examples/interfaceframework/qface-if-addressbook/frontend/CMakeLists.txt
+++ b/examples/interfaceframework/qface-if-addressbook/frontend/CMakeLists.txt
@@ -21,8 +21,8 @@ add_library(QtIfAdressBookExample)
 
 # Interface Framework Generator:
 qt6_ifcodegen(QtIfAdressBookExample
-    QFACE_SOURCES ../example-if-addressbook.qface
-    QFACE_FORMAT frontend
+    IFCODEGEN_SOURCES ../example-if-addressbook.qface
+    IFCODEGEN_TEMPLATE frontend
 )
 
 set_target_properties(QtIfAdressBookExample PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../)
diff --git a/examples/interfaceframework/qface-if-addressbook/frontend/frontend.pro b/examples/interfaceframework/qface-if-addressbook/frontend/frontend.pro
index 65f52c5c..5be3a8d8 100644
--- a/examples/interfaceframework/qface-if-addressbook/frontend/frontend.pro
+++ b/examples/interfaceframework/qface-if-addressbook/frontend/frontend.pro
@@ -8,7 +8,7 @@ QT += interfaceframework interfaceframework-private qml quick
 
 DEFINES += QT_BUILD_EXAMPLE_IF_ADDRESSBOOK_LIB
 CONFIG += ifcodegen
-QFACE_SOURCES = ../example-if-addressbook.qface
+IFCODEGEN_SOURCES = ../example-if-addressbook.qface
 CONFIG += install_ok  # Do not cargo-cult this!
 target.path = $$[QT_INSTALL_EXAMPLES]/interfaceframework/qface-ifaddressbook
 INSTALLS += target
diff --git a/examples/interfaceframework/qface-if-climate/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-if-climate/backend_simulator/CMakeLists.txt
index e0ea3b88..e7a67b20 100644
--- a/examples/interfaceframework/qface-if-climate/backend_simulator/CMakeLists.txt
+++ b/examples/interfaceframework/qface-if-climate/backend_simulator/CMakeLists.txt
@@ -20,8 +20,8 @@ set_target_properties(climate_backend_simulator PROPERTIES LIBRARY_OUTPUT_DIRECT
 
 # Interface Framework Generator:
 qt6_ifcodegen(climate_backend_simulator
-    QFACE_SOURCES ../example-if-climate.qface
-    QFACE_FORMAT backend_simulator
+    IFCODEGEN_SOURCES ../example-if-climate.qface
+    IFCODEGEN_TEMPLATE backend_simulator
 )
 
 target_link_libraries(climate_backend_simulator PUBLIC
diff --git a/examples/interfaceframework/qface-if-climate/backend_simulator/backend_simulator.pro b/examples/interfaceframework/qface-if-climate/backend_simulator/backend_simulator.pro
index 3f7cce52..8f92435e 100644
--- a/examples/interfaceframework/qface-if-climate/backend_simulator/backend_simulator.pro
+++ b/examples/interfaceframework/qface-if-climate/backend_simulator/backend_simulator.pro
@@ -15,8 +15,8 @@ INCLUDEPATH += $$OUT_PWD/../frontend
 QT += core interfaceframework
 #! [2]
 CONFIG += ifcodegen plugin
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../example-if-climate.qface
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../example-if-climate.qface
 PLUGIN_TYPE = interfaceframework
 PLUGIN_CLASS_NAME = ClimateSimulatorPlugin
 #! [2]
diff --git a/examples/interfaceframework/qface-if-climate/frontend/CMakeLists.txt b/examples/interfaceframework/qface-if-climate/frontend/CMakeLists.txt
index 5dfd37ea..f15370fb 100644
--- a/examples/interfaceframework/qface-if-climate/frontend/CMakeLists.txt
+++ b/examples/interfaceframework/qface-if-climate/frontend/CMakeLists.txt
@@ -21,8 +21,8 @@ add_library(QtIfClimateExample)
 
 # Interface Framework Generator:
 qt6_ifcodegen(QtIfClimateExample
-    QFACE_SOURCES ../example-if-climate.qface
-    QFACE_FORMAT frontend
+    IFCODEGEN_SOURCES ../example-if-climate.qface
+    IFCODEGEN_TEMPLATE frontend
 )
 
 set_target_properties(QtIfClimateExample PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
diff --git a/examples/interfaceframework/qface-if-climate/frontend/frontend.pro b/examples/interfaceframework/qface-if-climate/frontend/frontend.pro
index 6982d34a..3513e5bb 100644
--- a/examples/interfaceframework/qface-if-climate/frontend/frontend.pro
+++ b/examples/interfaceframework/qface-if-climate/frontend/frontend.pro
@@ -11,7 +11,7 @@ QT += interfaceframework interfaceframework-private qml quick
 DEFINES += QT_BUILD_EXAMPLE_IF_CLIMATE_LIB
 #! [1]
 CONFIG += ifcodegen
-QFACE_SOURCES = ../example-if-climate.qface
+IFCODEGEN_SOURCES = ../example-if-climate.qface
 #! [1]
 CONFIG += install_ok  # Do not cargo-cult this!
 target.path = $$[QT_INSTALL_EXAMPLES]/interfaceframework/qface-if-climate
diff --git a/examples/interfaceframework/qface-if-remote/backend_qtro/CMakeLists.txt b/examples/interfaceframework/qface-if-remote/backend_qtro/CMakeLists.txt
index 71b4e6e4..39a7c0ac 100644
--- a/examples/interfaceframework/qface-if-remote/backend_qtro/CMakeLists.txt
+++ b/examples/interfaceframework/qface-if-remote/backend_qtro/CMakeLists.txt
@@ -20,8 +20,8 @@ set_target_properties(remote_backend_qtro PROPERTIES LIBRARY_OUTPUT_DIRECTORY ..
 
 # Interface Framework Generator:
 qt6_ifcodegen(remote_backend_qtro
-    QFACE_SOURCES ../example-if-remote.qface
-    QFACE_FORMAT backend_qtro
+    IFCODEGEN_SOURCES ../example-if-remote.qface
+    IFCODEGEN_TEMPLATE backend_qtro
 )
 
 target_link_libraries(remote_backend_qtro PUBLIC
diff --git a/examples/interfaceframework/qface-if-remote/backend_qtro/backend_qtro.pro b/examples/interfaceframework/qface-if-remote/backend_qtro/backend_qtro.pro
index 098be885..be83f15e 100644
--- a/examples/interfaceframework/qface-if-remote/backend_qtro/backend_qtro.pro
+++ b/examples/interfaceframework/qface-if-remote/backend_qtro/backend_qtro.pro
@@ -15,8 +15,8 @@ INCLUDEPATH += $$OUT_PWD/../frontend
 QT += core interfaceframework
 #! [2]
 CONFIG += ifcodegen plugin
-QFACE_FORMAT = backend_qtro
-QFACE_SOURCES = ../example-if-remote.qface
+IFCODEGEN_TEMPLATE = backend_qtro
+IFCODEGEN_SOURCES = ../example-if-remote.qface
 PLUGIN_TYPE = interfaceframework
 PLUGIN_CLASS_NAME = RemoteClientQtROPlugin
 #! [2]
diff --git a/examples/interfaceframework/qface-if-remote/frontend/CMakeLists.txt b/examples/interfaceframework/qface-if-remote/frontend/CMakeLists.txt
index a5ff165e..e951dc93 100644
--- a/examples/interfaceframework/qface-if-remote/frontend/CMakeLists.txt
+++ b/examples/interfaceframework/qface-if-remote/frontend/CMakeLists.txt
@@ -25,8 +25,8 @@ add_library(QtIfRemoteExample)
 
 # Interface Framework Generator:
 qt6_ifcodegen(QtIfRemoteExample
-    QFACE_SOURCES ../example-if-remote.qface
-    QFACE_FORMAT frontend
+    IFCODEGEN_SOURCES ../example-if-remote.qface
+    IFCODEGEN_TEMPLATE frontend
 )
 
 set_target_properties(QtIfRemoteExample PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
diff --git a/examples/interfaceframework/qface-if-remote/frontend/frontend.pro b/examples/interfaceframework/qface-if-remote/frontend/frontend.pro
index c3119928..7aad23ef 100644
--- a/examples/interfaceframework/qface-if-remote/frontend/frontend.pro
+++ b/examples/interfaceframework/qface-if-remote/frontend/frontend.pro
@@ -11,7 +11,7 @@ QT += interfaceframework interfaceframework-private qml quick
 DEFINES += QT_BUILD_EXAMPLE_IF_REMOTE_LIB
 #! [1]
 CONFIG += ifcodegen
-QFACE_SOURCES = ../example-if-remote.qface
+IFCODEGEN_SOURCES = ../example-if-remote.qface
 #! [1]
 CONFIG += install_ok  # Do not cargo-cult this!
 target.path = $$[QT_INSTALL_EXAMPLES]/interfaceframework/qface-if-remote
diff --git a/examples/interfaceframework/qface-if-remote/server_qtro/CMakeLists.txt b/examples/interfaceframework/qface-if-remote/server_qtro/CMakeLists.txt
index a65d8cb6..da362d7c 100644
--- a/examples/interfaceframework/qface-if-remote/server_qtro/CMakeLists.txt
+++ b/examples/interfaceframework/qface-if-remote/server_qtro/CMakeLists.txt
@@ -24,8 +24,8 @@ qt_add_executable(qface-if-remote-server
 
 # Interface Framework Generator:
 qt6_ifcodegen(qface-if-remote-server
-    QFACE_SOURCES ../example-if-remote.qface
-    QFACE_FORMAT server_qtro
+    IFCODEGEN_SOURCES ../example-if-remote.qface
+    IFCODEGEN_TEMPLATE server_qtro
 )
 
 set_target_properties(qface-if-remote-server PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
diff --git a/examples/interfaceframework/qface-if-remote/server_qtro/server_qtro.pro b/examples/interfaceframework/qface-if-remote/server_qtro/server_qtro.pro
index ff4bf1b0..c89a77ce 100644
--- a/examples/interfaceframework/qface-if-remote/server_qtro/server_qtro.pro
+++ b/examples/interfaceframework/qface-if-remote/server_qtro/server_qtro.pro
@@ -15,8 +15,8 @@ SOURCES += main.cpp \
 
 QMAKE_RPATHDIR += $ORIGIN
 #! [1]
-QFACE_FORMAT = server_qtro
-QFACE_SOURCES = ../example-if-remote.qface
+IFCODEGEN_TEMPLATE = server_qtro
+IFCODEGEN_SOURCES = ../example-if-remote.qface
 #! [1]
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =
diff --git a/examples/interfaceframework/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt
index d9fdaaf8..edcfef62 100644
--- a/examples/interfaceframework/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt
@@ -22,8 +22,8 @@ set_target_properties(QtIfInstrumentCluster_Chapter1 PROPERTIES RUNTIME_OUTPUT_D
 
 # Interface Framework Generator:
 qt6_ifcodegen(QtIfInstrumentCluster_Chapter1
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT frontend
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE frontend
 )
 
 target_include_directories(QtIfInstrumentCluster_Chapter1 PUBLIC
diff --git a/examples/interfaceframework/qface-tutorial/chapter1-basics/frontend/frontend.pro b/examples/interfaceframework/qface-tutorial/chapter1-basics/frontend/frontend.pro
index e91ba397..5fada5ac 100644
--- a/examples/interfaceframework/qface-tutorial/chapter1-basics/frontend/frontend.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter1-basics/frontend/frontend.pro
@@ -6,7 +6,7 @@ QT += interfaceframework interfaceframework-private qml quick
 
 DEFINES += QT_BUILD_EXAMPLE_IF_INSTRUMENTCLUSTER_LIB
 CONFIG += ifcodegen
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 
 CONFIG += install_ok  # Do not cargo-cult this!
 target.path = $$[QT_INSTALL_EXAMPLES]/interfaceframework/qface-tutorial/chapter1-basics
diff --git a/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt
index 87dca903..d0e48168 100644
--- a/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt
@@ -22,8 +22,8 @@ set_target_properties(QtIfInstrumentCluster_Chapter2 PROPERTIES RUNTIME_OUTPUT_D
 
 # Interface Framework Generator:
 qt6_ifcodegen(QtIfInstrumentCluster_Chapter2
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT frontend
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE frontend
 )
 
 target_include_directories(QtIfInstrumentCluster_Chapter2 PUBLIC
diff --git a/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/frontend/frontend.pro b/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/frontend/frontend.pro
index 7cd601cc..0986c7a8 100644
--- a/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/frontend/frontend.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter2-enums-structs/frontend/frontend.pro
@@ -6,7 +6,7 @@ QT += interfaceframework interfaceframework-private qml quick
 
 DEFINES += QT_BUILD_EXAMPLE_IF_INSTRUMENTCLUSTER_LIB
 CONFIG += ifcodegen
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 
 CONFIG += install_ok  # Do not cargo-cult this!
 target.path = $$[QT_INSTALL_EXAMPLES]/interfaceframework/qface-tutorial/chapter2-enums-structs
diff --git a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt
index 265ad19b..b0f0a7c5 100644
--- a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt
@@ -20,8 +20,8 @@ set_target_properties(ic_chapter3_simulation PROPERTIES LIBRARY_OUTPUT_DIRECTORY
 
 # Interface Framework Generator:
 qt6_ifcodegen(ic_chapter3_simulation
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT backend_simulator
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE backend_simulator
 )
 
 target_link_libraries(ic_chapter3_simulation PUBLIC
diff --git a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/backend_simulator/backend_simulator.pro b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/backend_simulator/backend_simulator.pro
index 692e7e8e..21f2bbc2 100644
--- a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/backend_simulator/backend_simulator.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/backend_simulator/backend_simulator.pro
@@ -9,8 +9,8 @@ LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIfInstrumentCluster)
 INCLUDEPATH += $$OUT_PWD/../frontend
 QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../
 
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 PLUGIN_TYPE = interfaceframework
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
diff --git a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt
index a4df681a..367a1306 100644
--- a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt
@@ -22,8 +22,8 @@ set_target_properties(QtIfInstrumentCluster_Chapter3 PROPERTIES RUNTIME_OUTPUT_D
 
 # Interface Framework Generator:
 qt6_ifcodegen(QtIfInstrumentCluster_Chapter3
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT frontend
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE frontend
 )
 
 target_include_directories(QtIfInstrumentCluster_Chapter3 PUBLIC
diff --git a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/frontend/frontend.pro b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/frontend/frontend.pro
index a524dab4..9507ffe5 100644
--- a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/frontend/frontend.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/frontend/frontend.pro
@@ -6,7 +6,7 @@ QT += interfaceframework interfaceframework-private qml quick
 
 DEFINES += QT_BUILD_EXAMPLE_IF_INSTRUMENTCLUSTER_LIB
 CONFIG += ifcodegen
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 
 CONFIG += install_ok  # Do not cargo-cult this!
 target.path = $$[QT_INSTALL_EXAMPLES]/interfaceframework/qface-tutorial/chapter3-simulation-backend
diff --git a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt
index 2e855640..e7c7cb60 100644
--- a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt
@@ -18,8 +18,8 @@ find_package(Qt6 COMPONENTS InterfaceFramework)
 
 # Interface Framework Generator:
 qt6_ifcodegen(instrument_cluster_chapter3_imports # special case
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT qmlplugin
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE qmlplugin
 )
 
 target_link_libraries(instrument_cluster_chapter3_imports PUBLIC # special case
diff --git a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/imports.pro b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/imports.pro
index fb5a9ac6..4655c990 100644
--- a/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/imports.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/imports.pro
@@ -5,8 +5,8 @@ QT += interfaceframework
 LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIfInstrumentCluster)
 INCLUDEPATH += $$OUT_PWD/../frontend
 
-QFACE_FORMAT = qmlplugin
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_TEMPLATE = qmlplugin
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 
 load(ifcodegen)
 
diff --git a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt
index 21615ba4..7fc88b86 100644
--- a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt
@@ -20,8 +20,8 @@ set_target_properties(ic_chapter4_simulation PROPERTIES LIBRARY_OUTPUT_DIRECTORY
 
 # Interface Framework Generator:
 qt6_ifcodegen(ic_chapter4_simulation
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT backend_simulator
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE backend_simulator
 )
 
 target_link_libraries(ic_chapter4_simulation PUBLIC
diff --git a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/backend_simulator.pro b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/backend_simulator.pro
index 367f6c9d..abd8bd7a 100644
--- a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/backend_simulator.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/backend_simulator/backend_simulator.pro
@@ -9,8 +9,8 @@ LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIfInstrumentCluster)
 INCLUDEPATH += $$OUT_PWD/../frontend
 QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../
 
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 PLUGIN_TYPE = interfaceframework
 
 RESOURCES += \
diff --git a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt
index a3425cff..ae384b55 100644
--- a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt
@@ -22,8 +22,8 @@ set_target_properties(QtIfInstrumentCluster_Chapter4 PROPERTIES RUNTIME_OUTPUT_D
 
 # Interface Framework Generator:
 qt6_ifcodegen(QtIfInstrumentCluster_Chapter4
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT frontend
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE frontend
 )
 
 target_include_directories(QtIfInstrumentCluster_Chapter4 PUBLIC
diff --git a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/frontend.pro b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/frontend.pro
index da91fe7b..bcd4adfa 100644
--- a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/frontend.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/frontend/frontend.pro
@@ -6,7 +6,7 @@ QT += interfaceframework interfaceframework-private qml quick
 
 DEFINES += QT_BUILD_EXAMPLE_IF_INSTRUMENTCLUSTER_LIB
 CONFIG += ifcodegen
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 
 CONFIG += install_ok  # Do not cargo-cult this!
 target.path = $$[QT_INSTALL_EXAMPLES]/interfaceframework/qface-tutorial/chapter4-simulation-behavior
diff --git a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt
index c0a5804d..40431d95 100644
--- a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt
@@ -18,8 +18,8 @@ find_package(Qt6 COMPONENTS InterfaceFramework)
 
 # Interface Framework Generator:
 qt6_ifcodegen(instrument_cluster_chapter4_imports # special case
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT qmlplugin
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE qmlplugin
 )
 
 target_link_libraries(instrument_cluster_chapter4_imports PUBLIC # special case
diff --git a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/imports.pro b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/imports.pro
index fd6284c7..85457130 100644
--- a/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/imports.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter4-simulation-behavior/imports/imports.pro
@@ -5,8 +5,8 @@ QT += interfaceframework
 LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIfInstrumentCluster)
 INCLUDEPATH += $$OUT_PWD/../frontend
 
-QFACE_FORMAT = qmlplugin
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_TEMPLATE = qmlplugin
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 
 load(ifcodegen)
 
diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt
index 3ccba71b..2cc66844 100644
--- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt
@@ -20,8 +20,8 @@ set_target_properties(ic_qtro PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../interfacefr
 
 # Interface Framework Generator:
 qt6_ifcodegen(ic_qtro
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT backend_qtro
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE backend_qtro
 )
 
 target_link_libraries(ic_qtro PUBLIC
diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/backend_qtro.pro b/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/backend_qtro.pro
index 55db7279..9c701631 100644
--- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/backend_qtro.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_qtro/backend_qtro.pro
@@ -9,8 +9,8 @@ LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIfInstrumentCluster)
 INCLUDEPATH += $$OUT_PWD/../frontend
 QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../
 
-QFACE_FORMAT = backend_qtro
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_TEMPLATE = backend_qtro
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 PLUGIN_TYPE = interfaceframework
 
 CONFIG += install_ok  # Do not cargo-cult this!
diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt
index 0c4d6555..fbe94947 100644
--- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt
@@ -20,8 +20,8 @@ set_target_properties(ic_chapter5_simulation PROPERTIES LIBRARY_OUTPUT_DIRECTORY
 
 # Interface Framework Generator:
 qt6_ifcodegen(ic_chapter5_simulation
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT backend_simulator
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE backend_simulator
 )
 
 target_link_libraries(ic_chapter5_simulation PUBLIC
diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_simulator/backend_simulator.pro b/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_simulator/backend_simulator.pro
index 27b8c0ad..4616ec39 100644
--- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_simulator/backend_simulator.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/backend_simulator/backend_simulator.pro
@@ -9,8 +9,8 @@ LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIfInstrumentCluster)
 INCLUDEPATH += $$OUT_PWD/../frontend
 QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../
 
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 PLUGIN_TYPE = interfaceframework
 
 RESOURCES += \
diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt
index fa7071f2..24841a30 100644
--- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt
@@ -22,8 +22,8 @@ set_target_properties(QtIfInstrumentCluster_Chapter5 PROPERTIES RUNTIME_OUTPUT_D
 
 # Interface Framework Generator:
 qt6_ifcodegen(QtIfInstrumentCluster_Chapter5
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT frontend
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE frontend
 )
 
 target_include_directories(QtIfInstrumentCluster_Chapter5 PUBLIC
diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/frontend/frontend.pro b/examples/interfaceframework/qface-tutorial/chapter5-ipc/frontend/frontend.pro
index 8dcf5351..56b9ce2f 100644
--- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/frontend/frontend.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/frontend/frontend.pro
@@ -6,7 +6,7 @@ QT += interfaceframework interfaceframework-private qml quick
 
 DEFINES += QT_BUILD_EXAMPLE_IF_INSTRUMENTCLUSTER_LIB
 CONFIG += ifcodegen
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 
 CONFIG += install_ok  # Do not cargo-cult this!
 target.path = $$[QT_INSTALL_EXAMPLES]/interfaceframework/qface-tutorial/chapter5-ipc
diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt
index 5af39a38..a41e7f54 100644
--- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt
@@ -18,8 +18,8 @@ find_package(Qt6 COMPONENTS InterfaceFramework)
 
 # Interface Framework Generator:
 qt6_ifcodegen(instrument_cluster_chapter5_imports
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT qmlplugin
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE qmlplugin
 )
 
 target_link_libraries(instrument_cluster_chapter5_imports PUBLIC
diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/imports.pro b/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/imports.pro
index 59cd475e..619cfdb7 100644
--- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/imports.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/imports/imports.pro
@@ -5,8 +5,8 @@ QT += interfaceframework
 LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIfInstrumentCluster)
 INCLUDEPATH += $$OUT_PWD/../frontend
 
-QFACE_FORMAT = qmlplugin
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_TEMPLATE = qmlplugin
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 
 load(ifcodegen)
 
diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt
index 7796dd37..b9c10ff6 100644
--- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt
@@ -19,8 +19,8 @@ set_target_properties(chapter5-ipc-server PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..
 
 # Interface Framework Generator:
 qt6_ifcodegen(chapter5-ipc-server
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT server_qtro_simulator
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE server_qtro_simulator
 )
 set_target_properties(chapter5-ipc-server PROPERTIES
     WIN32_EXECUTABLE TRUE
diff --git a/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/simulation_server.pro b/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/simulation_server.pro
index a92bceb6..14315d0c 100644
--- a/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/simulation_server.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server/simulation_server.pro
@@ -9,8 +9,8 @@ CONFIG += ifcodegen
 LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIfInstrumentCluster)
 INCLUDEPATH += $$OUT_PWD/../frontend
 
-QFACE_FORMAT = server_qtro_simulator
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_TEMPLATE = server_qtro_simulator
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 
 QML_IMPORT_PATH = $$OUT_PWD/qml
 
diff --git a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt
index a72a9f41..e642cdfe 100644
--- a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt
@@ -20,8 +20,8 @@ set_target_properties(ic_chapter6_simulation PROPERTIES LIBRARY_OUTPUT_DIRECTORY
 
 # Interface Framework Generator:
 qt6_ifcodegen(ic_chapter6_simulation
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT backend_simulator
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE backend_simulator
 )
 
 target_link_libraries(ic_chapter6_simulation PUBLIC
diff --git a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/backend_simulator/backend_simulator.pro b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/backend_simulator/backend_simulator.pro
index 1bf50e0a..8094a4ce 100644
--- a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/backend_simulator/backend_simulator.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/backend_simulator/backend_simulator.pro
@@ -9,8 +9,8 @@ LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIfInstrumentCluster)
 INCLUDEPATH += $$OUT_PWD/../frontend
 QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/../
 
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 PLUGIN_TYPE = interfaceframework
 
 RESOURCES += \
diff --git a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt
index 9dbdcc35..0e3929da 100644
--- a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt
@@ -26,8 +26,8 @@ set_target_properties(QtIfInstrumentCluster_Chapter6 PROPERTIES RUNTIME_OUTPUT_D
 
 # Interface Framework Generator:
 qt6_ifcodegen(QtIfInstrumentCluster_Chapter6
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT frontend
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE frontend
 )
 
 target_include_directories(QtIfInstrumentCluster_Chapter6 PUBLIC
diff --git a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/frontend/frontend.pro b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/frontend/frontend.pro
index 5df4f9cd..5a5b94c7 100644
--- a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/frontend/frontend.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/frontend/frontend.pro
@@ -6,7 +6,7 @@ QT += interfaceframework interfaceframework-private qml quick
 
 DEFINES += QT_BUILD_EXAMPLE_IF_INSTRUMENTCLUSTER_LIB
 CONFIG += ifcodegen
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 
 CONFIG += install_ok  # Do not cargo-cult this!
 target.path = $$[QT_INSTALL_EXAMPLES]/interfaceframework/qface-tutorial/chapter6-own-backend
diff --git a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt
index 2b4bbe9f..a3c3db32 100644
--- a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt
+++ b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt
@@ -18,8 +18,8 @@ find_package(Qt6 COMPONENTS InterfaceFramework)
 
 # Interface Framework Generator:
 qt6_ifcodegen(instrument_cluster_chapter6_imports
-    QFACE_SOURCES ../instrument-cluster.qface
-    QFACE_FORMAT qmlplugin
+    IFCODEGEN_SOURCES ../instrument-cluster.qface
+    IFCODEGEN_TEMPLATE qmlplugin
 )
 
 target_link_libraries(instrument_cluster_chapter6_imports PUBLIC
diff --git a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/imports.pro b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/imports.pro
index 6314a3a2..8404889a 100644
--- a/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/imports.pro
+++ b/examples/interfaceframework/qface-tutorial/chapter6-own-backend/imports/imports.pro
@@ -5,8 +5,8 @@ QT += interfaceframework
 LIBS += -L$$OUT_PWD/../ -l$$qtLibraryTarget(QtIfInstrumentCluster)
 INCLUDEPATH += $$OUT_PWD/../frontend
 
-QFACE_FORMAT = qmlplugin
-QFACE_SOURCES = ../instrument-cluster.qface
+IFCODEGEN_TEMPLATE = qmlplugin
+IFCODEGEN_SOURCES = ../instrument-cluster.qface
 
 load(ifcodegen)
 
diff --git a/mkspecs/features/ifcodegen.prf b/mkspecs/features/ifcodegen.prf
index 3bf033e7..52e90437 100644
--- a/mkspecs/features/ifcodegen.prf
+++ b/mkspecs/features/ifcodegen.prf
@@ -3,19 +3,19 @@
 # If building a module, use load(ifcodegen_qt_module) instead
 #
 # Example input:
-#   QFACE_SOURCES += my.foo.qface [required]
-#   QFACE_MODULE_NAME = my_module_name
-#   QFACE_FORMAT = frontend (or backend, simulator... -- defaults to "frontend")
-#   QFACE_OUTPUT_DIR = my_output_dir (defaults to current build dir)
-#   QFACE_ANNOTATIONS += additional.yaml
+#   IFCODEGEN_SOURCES += my.foo.qface [required]
+#   IFCODEGEN_MODULE_NAME = my_module_name
+#   IFCODEGEN_TEMPLATE = frontend (or backend, simulator... -- defaults to "frontend")
+#   IFCODEGEN_OUTPUT_DIR = my_output_dir (defaults to current build dir)
+#   IFCODEGEN_ANNOTATIONS += additional.yaml
 #
 QT_FOR_CONFIG += interfaceframework interfaceframework-private
 
-isEmpty(QFACE_FORMAT): QFACE_FORMAT = frontend
-isEmpty(QFACE_OUTPUT_DIR): QFACE_OUTPUT_DIR = $$OUT_PWD
-isEmpty(QFACE_SOURCES): error("QFACE_SOURCES must be set!")
+isEmpty(IFCODEGEN_TEMPLATE): IFCODEGEN_TEMPLATE = frontend
+isEmpty(IFCODEGEN_OUTPUT_DIR): IFCODEGEN_OUTPUT_DIR = $$OUT_PWD
+isEmpty(IFCODEGEN_SOURCES): error("IFCODEGEN_SOURCES must be set!")
 
-!contains(QFACE_SOURCES, .+\\.qface$) {
+!contains(IFCODEGEN_SOURCES, .+\\.qface$) {
     error("Invalid qface file provided: The file needs to end with .qface")
 }
 
@@ -24,12 +24,12 @@ win32-msvc*:!contains(CONFIG, debug_and_release) {
     error("The ifcodegen works only in the debug_and_release configuration on windows")
 }
 
-QFACE_PWD = $$dirname(QFACE_SOURCES)
-QFACE_ABS_PWD = $$absolute_path($$QFACE_PWD, $$_PRO_FILE_PWD_)
-QFACE_FILE = $$basename(QFACE_SOURCES)
-QFACE_BASE_NAME = $$replace(QFACE_FILE, .qface, )
-QFACE_YAML = $$QFACE_ABS_PWD/$${QFACE_BASE_NAME}.yaml
-OTHER_FILES += $$QFACE_ABS_PWD/$$QFACE_FILE
+IFCODEGEN_PWD = $$dirname(IFCODEGEN_SOURCES)
+IFCODEGEN_ABS_PWD = $$absolute_path($$IFCODEGEN_PWD, $$_PRO_FILE_PWD_)
+IFCODEGEN_FILE = $$basename(IFCODEGEN_SOURCES)
+IFCODEGEN_BASE_NAME = $$replace(IFCODEGEN_FILE, .qface, )
+IFCODEGEN_YAML = $$IFCODEGEN_ABS_PWD/$${IFCODEGEN_BASE_NAME}.yaml
+OTHER_FILES += $$IFCODEGEN_ABS_PWD/$$IFCODEGEN_FILE
 
 # The 'click' library used by the generator needs to have a utf8 locale setup.
 equals(QMAKE_HOST.os, Windows): ENV = chcp 65001 &&
@@ -73,22 +73,22 @@ qtConfig(system-qface) {
 }
 IF_GENERATOR = $$system_quote($$PYTHON) $$IF_GENERATOR_PATH/generate.py
 
-# TODO make this work with multiple input files, or only support one QFACE_SOURCE
+# TODO make this work with multiple input files, or only support one IFCODEGEN_SOURCE
 # Although this could be extra_compiler it is a normal EXTRA_TARGET for a reason.
 # In the debug_and_release configuration, we want to have the generator executed
 # during the run of the meta Makefile to only generate the code once.
-PRI = $$QFACE_OUTPUT_DIR/$$lower($${QFACE_BASE_NAME}).pri
-IF_GENERATOR_OPTIONS = --format=$$QFACE_FORMAT --force
-!isEmpty(QFACE_MODULE_NAME): IF_GENERATOR_OPTIONS += --module=$${QFACE_MODULE_NAME}
-for (ANNOTATION, QFACE_ANNOTATIONS) {
+PRI = $$IFCODEGEN_OUTPUT_DIR/$$lower($${IFCODEGEN_BASE_NAME}).pri
+IF_GENERATOR_OPTIONS = --template=$$IFCODEGEN_TEMPLATE --force
+!isEmpty(IFCODEGEN_MODULE_NAME): IF_GENERATOR_OPTIONS += --module=$${IFCODEGEN_MODULE_NAME}
+for (ANNOTATION, IFCODEGEN_ANNOTATIONS) {
     file = $$absolute_path($$ANNOTATION, $$_PRO_FILE_PWD_)
 
     IF_GENERATOR_OPTIONS += -A $$system_quote($$system_path($$file))
-    qface_sources.depends += $$file
+    ifcodegen_sources.depends += $$file
     OTHER_FILES += $$file
 }
 
-for (IMPORT, QFACE_IMPORT_PATH) {
+for (IMPORT, IFCODEGEN_IMPORT_PATH) {
     dir = $$absolute_path($$IMPORT, $$_PRO_FILE_PWD_)
 
     IF_GENERATOR_OPTIONS += -I $$system_quote($$system_path($$dir))
@@ -103,37 +103,37 @@ equals(QMAKE_HOST.os, Windows): {
     TOUCH = touch
 }
 
-qface_sources.target = $$relative_path(.stamp-ifcodegen, $$OUT_PWD)
-qface_sources.commands += $(DEL_FILE) $$system_quote($$system_path($$OUT_PWD/.stamp-ifcodegen)) &&
-qface_sources.commands += $$SLEEP && $$ENV $$system_path($$IF_GENERATOR) $$IF_GENERATOR_OPTIONS $$system_quote($$system_path($$QFACE_ABS_PWD/$${QFACE_FILE})) $$system_quote($$system_path($$QFACE_OUTPUT_DIR)) &&
-qface_sources.commands += $$TOUCH $$system_quote($$system_path($$OUT_PWD/.stamp-ifcodegen))
-qface_sources.depends = $$IF_GENERATOR_PATH/generate.py
-qface_sources.depends += $$QFACE_ABS_PWD/$${QFACE_FILE}
-qface_sources.depends += $$files($$IF_GENERATOR_PATH/templates/common/*)
+ifcodegen_sources.target = $$relative_path(.stamp-ifcodegen, $$OUT_PWD)
+ifcodegen_sources.commands += $(DEL_FILE) $$system_quote($$system_path($$OUT_PWD/.stamp-ifcodegen)) &&
+ifcodegen_sources.commands += $$SLEEP && $$ENV $$system_path($$IF_GENERATOR) $$IF_GENERATOR_OPTIONS $$system_quote($$system_path($$IFCODEGEN_ABS_PWD/$${IFCODEGEN_FILE})) $$system_quote($$system_path($$IFCODEGEN_OUTPUT_DIR)) &&
+ifcodegen_sources.commands += $$TOUCH $$system_quote($$system_path($$OUT_PWD/.stamp-ifcodegen))
+ifcodegen_sources.depends = $$IF_GENERATOR_PATH/generate.py
+ifcodegen_sources.depends += $$IFCODEGEN_ABS_PWD/$${IFCODEGEN_FILE}
+ifcodegen_sources.depends += $$files($$IF_GENERATOR_PATH/templates/common/*)
 
 QMAKE_CLEAN += $$relative_path(.stamp-ifcodegen, $$OUT_PWD)
 
 # Add all templates of the generator format as dependency
-QFACE_TEMPLATE_PWD = $$IF_GENERATOR_PATH/templates/$${QFACE_FORMAT}
-exists($$QFACE_TEMPLATE_PWD) {
-    qface_sources.depends += $$files($${QFACE_TEMPLATE_PWD}/*)
-} else: exists($${QFACE_FORMAT}) {
-    qface_sources.depends += $$files($${QFACE_FORMAT}/*)
+IFCODEGEN_TEMPLATE_PWD = $$IF_GENERATOR_PATH/templates/$${IFCODEGEN_TEMPLATE}
+exists($$IFCODEGEN_TEMPLATE_PWD) {
+    ifcodegen_sources.depends += $$files($${IFCODEGEN_TEMPLATE_PWD}/*)
+} else: exists($${IFCODEGEN_TEMPLATE}) {
+    ifcodegen_sources.depends += $$files($${IFCODEGEN_TEMPLATE}/*)
 } else {
-    error("Invalid QFACE_FORMAT: Couldn't find the template folder: $$QFACE_TEMPLATE_PWD")
+    error("Invalid IFCODEGEN_TEMPLATE: Couldn't find the template folder: $$IFCODEGEN_TEMPLATE_PWD")
 }
 
 # Add the configuration yaml as dependency and to other files
-exists($$QFACE_YAML) {
-    qface_sources.depends += $$QFACE_YAML
-    OTHER_FILES += $$QFACE_YAML
+exists($$IFCODEGEN_YAML) {
+    ifcodegen_sources.depends += $$IFCODEGEN_YAML
+    OTHER_FILES += $$IFCODEGEN_YAML
 }
 
-!isEmpty(QFACE_HEADERS_OUTPUT_DIR) {
-    QFACE_HEADERS_OUTPUT_TARGET = $${QFACE_HEADERS_OUTPUT_DIR}/$$lower($${QFACE_MODULE_NAME})module.h
-    qface_headers.target = $$relative_path($$QFACE_HEADERS_OUTPUT_TARGET, $$OUT_PWD)
-    qface_headers.commands = $${QMAKE_COPY_FILE} $${QFACE_OUTPUT_DIR}/*.h $${QFACE_HEADERS_OUTPUT_DIR}
-    qface_headers.depends = $$relative_path(.stamp-ifcodegen, $$OUT_PWD) $$IF_GENERATOR_PATH/generate.py
+!isEmpty(IFCODEGEN_HEADERS_OUTPUT_DIR) {
+    IFCODEGEN_HEADERS_OUTPUT_TARGET = $${IFCODEGEN_HEADERS_OUTPUT_DIR}/$$lower($${IFCODEGEN_MODULE_NAME})module.h
+    ifcodegen_headers.target = $$relative_path($$IFCODEGEN_HEADERS_OUTPUT_TARGET, $$OUT_PWD)
+    ifcodegen_headers.commands = $${QMAKE_COPY_FILE} $${IFCODEGEN_OUTPUT_DIR}/*.h $${IFCODEGEN_HEADERS_OUTPUT_DIR}
+    ifcodegen_headers.depends = $$relative_path(.stamp-ifcodegen, $$OUT_PWD) $$IF_GENERATOR_PATH/generate.py
 }
 
 # Reevaluate the Makefile after the generation has finished
@@ -152,9 +152,9 @@ Makefile.depends = $$relative_path(.stamp-ifcodegen, $$OUT_PWD)
 !qtConfig(system-qface):!isEmpty(QTIF_BUILD_ROOT):!exists($$VIRTUALENV_PATH): {
     Makefile.depends = $$shadowed($$IF_GENERATOR_PATH)/forceRebuild
 } else {
-    !isEmpty(QFACE_HEADERS_OUTPUT_TARGET) {
-        Makefile.depends += $$relative_path($$QFACE_HEADERS_OUTPUT_TARGET, $$OUT_PWD)
-        QMAKE_EXTRA_TARGETS += qface_headers
+    !isEmpty(IFCODEGEN_HEADERS_OUTPUT_TARGET) {
+        Makefile.depends += $$relative_path($$IFCODEGEN_HEADERS_OUTPUT_TARGET, $$OUT_PWD)
+        QMAKE_EXTRA_TARGETS += ifcodegen_headers
     }
 }
 
@@ -179,7 +179,7 @@ exists($$PRI) {
     OTHER_FILES += $$OTHER_FILES_ORIG
 }
 
-QMAKE_EXTRA_TARGETS += Makefile qface_sources
+QMAKE_EXTRA_TARGETS += Makefile ifcodegen_sources
 
 # NMAKE doesn't support the Makefile target to call qmake and reevaluate itself
 # Because of that, the autogeneration is not started at all and if started
diff --git a/mkspecs/features/ifcodegen_qt_module.prf b/mkspecs/features/ifcodegen_qt_module.prf
index fe465d66..cd5690f0 100644
--- a/mkspecs/features/ifcodegen_qt_module.prf
+++ b/mkspecs/features/ifcodegen_qt_module.prf
@@ -3,29 +3,29 @@
 # If not building a module, use CONFIG += ifcodegen instead
 #
 # Example input:
-#   QFACE_SOURCES += my.foo.qface [required]
-#   QFACE_MODULE_NAME = my_module_name
-#   QFACE_FORMAT = frontend (or backend, simulator... -- defaults to "frontend")
-#   QFACE_OUTPUT_DIR = my_output_dir (defaults to current build dir)
+#   IFCODEGEN_SOURCES += my.foo.qface [required]
+#   IFCODEGEN_MODULE_NAME = my_module_name
+#   IFCODEGEN_TEMPLATE = frontend (or backend, simulator... -- defaults to "frontend")
+#   IFCODEGEN_OUTPUT_DIR = my_output_dir (defaults to current build dir)
 #
 
-!contains(QFACE_SOURCES, .+\\.qface$) {
+!contains(IFCODEGEN_SOURCES, .+\\.qface$) {
     error("Invalid qface file provided: The file needs to end with .qface")
 }
 
-isEmpty(QFACE_MODULE_NAME) {
-    error("QFACE_MODULE_NAME needs to be set when a qt module should be generated")
+isEmpty(IFCODEGEN_MODULE_NAME) {
+    error("IFCODEGEN_MODULE_NAME needs to be set when a qt module should be generated")
 }
 
-QFACE_PWD = $$dirname(QFACE_SOURCES)
-QFACE_ABS_PWD = $$absolute_path($$QFACE_PWD, $$_PRO_FILE_PWD_)
+IFCODEGEN_PWD = $$dirname(IFCODEGEN_SOURCES)
+IFCODEGEN_ABS_PWD = $$absolute_path($$IFCODEGEN_PWD, $$_PRO_FILE_PWD_)
 
 load(qt_build_paths)
 !force_independent {
-    QFACE_HEADERS_REL_DIR = $$relative_path($$QFACE_ABS_PWD, $$QTIF_ROOT)
-    QFACE_HEADERS_OUTPUT_DIR = $${MODULE_BASE_OUTDIR}/$${QFACE_HEADERS_REL_DIR}
-    !exists(QFACE_HEADERS_OUTPUT_DIR) {
-        mkpath($${QFACE_HEADERS_OUTPUT_DIR})
+    IFCODEGEN_HEADERS_REL_DIR = $$relative_path($$IFCODEGEN_ABS_PWD, $$QTIF_ROOT)
+    IFCODEGEN_HEADERS_OUTPUT_DIR = $${MODULE_BASE_OUTDIR}/$${IFCODEGEN_HEADERS_REL_DIR}
+    !exists(IFCODEGEN_HEADERS_OUTPUT_DIR) {
+        mkpath($${IFCODEGEN_HEADERS_OUTPUT_DIR})
     }
 }
 
diff --git a/src/ifvehiclefunctions/CMakeLists.txt b/src/ifvehiclefunctions/CMakeLists.txt
index 8ba4e142..a65ae803 100644
--- a/src/ifvehiclefunctions/CMakeLists.txt
+++ b/src/ifvehiclefunctions/CMakeLists.txt
@@ -6,10 +6,10 @@
 #####################################################################
 
 qt_ifcodegen_generate(
-    QFACE_SOURCES ifvehiclefunctions.qface
-    QFACE_FORMAT frontend
-    QFACE_MODULE_NAME QtIfVehicleFunctions
-    QFACE_HEADERS_OUTPUT_DIR ${QT_BUILD_DIR}/src/ifvehiclefunctions
+    IFCODEGEN_SOURCES ifvehiclefunctions.qface
+    IFCODEGEN_TEMPLATE frontend
+    IFCODEGEN_MODULE_NAME QtIfVehicleFunctions
+    IFCODEGEN_HEADERS_OUTPUT_DIR ${QT_BUILD_DIR}/src/ifvehiclefunctions
 )
 make_directory(${QT_BUILD_DIR}/src/ifvehiclefunctions)
 
@@ -26,7 +26,7 @@ qt_internal_add_module(IfVehicleFunctions
 )
 
 qt_ifcodegen_include(IfVehicleFunctions
-    QFACE_SOURCES ifvehiclefunctions.qface
+    IFCODEGEN_SOURCES ifvehiclefunctions.qface
 )
 
 #####################################################################
diff --git a/src/imports/vehiclefunctions/CMakeLists.txt b/src/imports/vehiclefunctions/CMakeLists.txt
index 549c4134..37a14f53 100644
--- a/src/imports/vehiclefunctions/CMakeLists.txt
+++ b/src/imports/vehiclefunctions/CMakeLists.txt
@@ -8,9 +8,9 @@ set(CMAKE_AUTOMOC ON)
 
 # Interface Framework Generator:
 qt_ifcodegen(qtifvehiclefunctionsplugin
-    QFACE_SOURCES ../../ifvehiclefunctions/ifvehiclefunctions.qface
-    QFACE_FORMAT qmlplugin
-    QFACE_MODULE_NAME QtIfVehicleFunctions
+    IFCODEGEN_SOURCES ../../ifvehiclefunctions/ifvehiclefunctions.qface
+    IFCODEGEN_TEMPLATE qmlplugin
+    IFCODEGEN_MODULE_NAME QtIfVehicleFunctions
 )
 
 # special case begin
diff --git a/src/interfaceframework/Qt6InterfaceFrameworkMacros.cmake b/src/interfaceframework/Qt6InterfaceFrameworkMacros.cmake
index 71ace74d..33e031b7 100644
--- a/src/interfaceframework/Qt6InterfaceFrameworkMacros.cmake
+++ b/src/interfaceframework/Qt6InterfaceFrameworkMacros.cmake
@@ -31,62 +31,62 @@ function(qt6_ifcodegen_generate)
     cmake_parse_arguments(
         PARSE_ARGV 0
         ARG
-        "VERBOSE" "QFACE_FORMAT;QFACE_OUTPUT_DIR;QFACE_SOURCES;QFACE_HEADERS_OUTPUT_DIR" "QFACE_ANNOTATIONS;QFACE_IMPORT_PATH"
+        "VERBOSE" "IFCODEGEN_TEMPLATE;IFCODEGEN_OUTPUT_DIR;IFCODEGEN_SOURCES;IFCODEGEN_HEADERS_OUTPUT_DIR" "IFCODEGEN_ANNOTATIONS;IFCODEGEN_IMPORT_PATH"
     )
 
     if (DEFINED ARG_KEYWORDS_MISSING_VALUES)
         message(FATAL_ERROR "Keywords can't be empty: ${ARG_KEYWORDS_MISSING_VALUES}")
     endif()
 
-    if (NOT DEFINED ARG_QFACE_FORMAT)
-        set(ARG_QFACE_FORMAT frontend)
+    if (NOT DEFINED ARG_IFCODEGEN_TEMPLATE)
+        set(ARG_IFCODEGEN_TEMPLATE frontend)
     endif()
-    set(QFACE_OUTPUT_DIR ${ARG_QFACE_OUTPUT_DIR})
-    if (NOT DEFINED ARG_QFACE_OUTPUT_DIR)
-        set(QFACE_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
+    set(IFCODEGEN_OUTPUT_DIR ${ARG_IFCODEGEN_OUTPUT_DIR})
+    if (NOT DEFINED ARG_IFCODEGEN_OUTPUT_DIR)
+        set(IFCODEGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
     endif()
-    if (NOT DEFINED ARG_QFACE_SOURCES)
-        message(FATAL_ERROR "QFACE_SOURCES can't be empty")
+    if (NOT DEFINED ARG_IFCODEGEN_SOURCES)
+        message(FATAL_ERROR "IFCODEGEN_SOURCES can't be empty")
     endif()
-    get_filename_component(QFACE_SOURCES "${ARG_QFACE_SOURCES}" REALPATH BASE_DIR)
-    get_filename_component(QFACE_SOURCE_DIR "${QFACE_SOURCES}" DIRECTORY)
-    get_filename_component(QFACE_BASE_NAME "${QFACE_SOURCES}" NAME_WLE)
-    get_filename_component(QFACE_SOURCE_ANNOTATION ${QFACE_SOURCE_DIR}/${QFACE_BASE_NAME}.yaml REALPATH BASE_DIR)
+    get_filename_component(IFCODEGEN_SOURCES "${ARG_IFCODEGEN_SOURCES}" REALPATH BASE_DIR)
+    get_filename_component(IFCODEGEN_SOURCE_DIR "${IFCODEGEN_SOURCES}" DIRECTORY)
+    get_filename_component(IFCODEGEN_BASE_NAME "${IFCODEGEN_SOURCES}" NAME_WLE)
+    get_filename_component(IFCODEGEN_SOURCE_ANNOTATION ${IFCODEGEN_SOURCE_DIR}/${IFCODEGEN_BASE_NAME}.yaml REALPATH BASE_DIR)
 
-    set(QFACE_TEMPLATE_PWD "${GENERATOR_PATH}/templates/${ARG_QFACE_FORMAT}")
-    if(EXISTS ${QFACE_TEMPLATE_PWD})
-        set(FORMAT_PATH ${QFACE_TEMPLATE_PWD})
-        set(QFACE_FORMAT ${ARG_QFACE_FORMAT})
+    set(IFCODEGEN_TEMPLATE_PWD "${GENERATOR_PATH}/templates/${ARG_IFCODEGEN_TEMPLATE}")
+    if(EXISTS ${IFCODEGEN_TEMPLATE_PWD})
+        set(TEMPLATE_PATH ${IFCODEGEN_TEMPLATE_PWD})
+        set(IFCODEGEN_TEMPLATE ${ARG_IFCODEGEN_TEMPLATE})
     else()
-        get_filename_component(FORMAT_PATH "${ARG_QFACE_FORMAT}" REALPATH)
-        if(EXISTS ${FORMAT_PATH})
-            set(QFACE_FORMAT ${FORMAT_PATH})
+        get_filename_component(TEMPLATE_PATH "${ARG_IFCODEGEN_TEMPLATE}" REALPATH)
+        if(EXISTS ${TEMPLATE_PATH})
+            set(IFCODEGEN_TEMPLATE ${TEMPLATE_PATH})
         endif()
     endif()
-    if (NOT DEFINED QFACE_FORMAT)
-        message(FATAL_ERROR "Invalid QFACE_FORMAT: Couldn't find the template folder: ${FORMAT_PATH}")
+    if (NOT DEFINED IFCODEGEN_TEMPLATE)
+        message(FATAL_ERROR "Invalid IFCODEGEN_TEMPLATE: Couldn't find the template folder: ${TEMPLATE_PATH}")
     endif()
 
     set(IDE_FILES)
 
     # Register all source files to cause a cmake rerun
     set(GEN_DEPENDENCIES)
-    list(APPEND GEN_DEPENDENCIES ${QFACE_SOURCES})
-    list(APPEND IDE_FILES ${QFACE_SOURCES})
-    if (EXISTS ${QFACE_SOURCE_ANNOTATION})
-        list(APPEND GEN_DEPENDENCIES ${QFACE_SOURCE_ANNOTATION})
-        list(APPEND IDE_FILES ${QFACE_SOURCE_ANNOTATION})
+    list(APPEND GEN_DEPENDENCIES ${IFCODEGEN_SOURCES})
+    list(APPEND IDE_FILES ${IFCODEGEN_SOURCES})
+    if (EXISTS ${IFCODEGEN_SOURCE_ANNOTATION})
+        list(APPEND GEN_DEPENDENCIES ${IFCODEGEN_SOURCE_ANNOTATION})
+        list(APPEND IDE_FILES ${IFCODEGEN_SOURCE_ANNOTATION})
     endif()
     # Also register all files which are part of the current template
-    file(GLOB FORMAT_FILES ${FORMAT_PATH}/*)
-    list(APPEND GEN_DEPENDENCIES ${FORMAT_FILES})
-    list(APPEND GEN_DEPENDENCIES ${FORMAT_PATH}.yaml)
+    file(GLOB TEMPLATE_FILES ${TEMPLATE_PATH}/*)
+    list(APPEND GEN_DEPENDENCIES ${TEMPLATE_FILES})
+    list(APPEND GEN_DEPENDENCIES ${TEMPLATE_PATH}.yaml)
     # Most templates also have a dependency to a common folder
-    file(GLOB COMMON_FORMAT_FILES ${GENERATOR_PATH}/templates/*common*/*)
-    list(APPEND GEN_DEPENDENCIES ${COMMON_FORMAT_FILES})
+    file(GLOB COMMON_TEMPLATE_FILES ${GENERATOR_PATH}/templates/*common*/*)
+    list(APPEND GEN_DEPENDENCIES ${COMMON_TEMPLATE_FILES})
 
-    set(GENERATOR_ARGUMENTS --format=${QFACE_FORMAT} --force)
-    foreach(ANNOTATION ${ARG_QFACE_ANNOTATIONS})
+    set(GENERATOR_ARGUMENTS --template=${IFCODEGEN_TEMPLATE} --force)
+    foreach(ANNOTATION ${ARG_IFCODEGEN_ANNOTATIONS})
         get_filename_component(ANNOTATION_PATH "${ANNOTATION}" REALPATH BASE_DIR)
         list(APPEND GENERATOR_ARGUMENTS -A ${ANNOTATION_PATH})
         # Dependency for regeneration
@@ -94,12 +94,12 @@ function(qt6_ifcodegen_generate)
         list(APPEND IDE_FILES ${ANNOTATION_PATH})
     endforeach()
 
-    foreach(IMPORT ${ARG_QFACE_IMPORT_PATH})
+    foreach(IMPORT ${ARG_IFCODEGEN_IMPORT_PATH})
         get_filename_component(IMPORT_PATH "${IMPORT}" REALPATH BASE_DIR)
         list(APPEND GENERATOR_ARGUMENTS -I ${IMPORT_PATH})
         # Dependency for regeneration
-        file(GLOB QFACE_FILES ${IMPORT_PATH}/*.qface)
-        list(APPEND GEN_DEPENDENCIES ${QFACE_FILES})
+        file(GLOB IFCODEGEN_FILES ${IMPORT_PATH}/*.qface)
+        list(APPEND GEN_DEPENDENCIES ${IFCODEGEN_FILES})
     endforeach()
 
     # Show qface and annotations in IDE
@@ -107,7 +107,7 @@ function(qt6_ifcodegen_generate)
     # fallback to the IDL base name
     set(IDE_PREFIX ${generator_target})
     if (NOT IDE_PREFIX)
-        set(IDE_PREFIX ${QFACE_BASE_NAME})
+        set(IDE_PREFIX ${IFCODEGEN_BASE_NAME})
     endif()
     add_custom_target(${IDE_PREFIX}_qface_files SOURCES
         ${IDE_FILES}
@@ -119,7 +119,7 @@ function(qt6_ifcodegen_generate)
     # Check for the timestamps to determine when to run it again.
     set(RUN_GENERATOR FALSE)
     foreach(DEP ${GEN_DEPENDENCIES})
-        if (${DEP} IS_NEWER_THAN ${QFACE_OUTPUT_DIR}/.stamp-ifcodegen)
+        if (${DEP} IS_NEWER_THAN ${IFCODEGEN_OUTPUT_DIR}/.stamp-ifcodegen)
             set(RUN_GENERATOR TRUE)
             break()
         endif()
@@ -145,13 +145,13 @@ function(qt6_ifcodegen_generate)
             set(ENV{IFGENERATOR_CONFIG} ${IFGENERATOR_CONFIG})
         endif()
 
-        message(STATUS "Running ifcodegen for ${QFACE_SOURCES} with template ${QFACE_FORMAT}")
+        message(STATUS "Running ifcodegen for ${IFCODEGEN_SOURCES} with template ${IFCODEGEN_TEMPLATE}")
         set(GENERATOR_CMD
                 ${PYTHON_EXECUTABLE}
                 ${GENERATOR_PATH}/generate.py
                 ${GENERATOR_ARGUMENTS}
-                ${QFACE_SOURCES}
-                ${QFACE_OUTPUT_DIR}
+                ${IFCODEGEN_SOURCES}
+                ${IFCODEGEN_OUTPUT_DIR}
             )
         list(JOIN GENERATOR_CMD " " GENERATOR_CMD_STR)
         execute_process(
@@ -167,16 +167,16 @@ function(qt6_ifcodegen_generate)
             if (ARG_VERBOSE OR IFCODEGEN_VERBOSE)
                 message(${GENERATOR_CMD_STR}\n${GENERATOR_LOG})
             endif()
-            execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${QFACE_OUTPUT_DIR}/.stamp-ifcodegen)
+            execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${IFCODEGEN_OUTPUT_DIR}/.stamp-ifcodegen)
         else()
             message(FATAL_ERROR "Error while running the ifcodegen:\n${GENERATOR_CMD_STR}\n${GENERATOR_LOG}")
         endif()
     endif()
 
     # hack for the developer-build to have all headers where the Qt build expects them
-    if (DEFINED ARG_QFACE_HEADERS_OUTPUT_DIR)
-        file(GLOB HEADER_FILES ${QFACE_OUTPUT_DIR}/*.h)
-        file(COPY ${HEADER_FILES} DESTINATION ${ARG_QFACE_HEADERS_OUTPUT_DIR})
+    if (DEFINED ARG_IFCODEGEN_HEADERS_OUTPUT_DIR)
+        file(GLOB HEADER_FILES ${IFCODEGEN_OUTPUT_DIR}/*.h)
+        file(COPY ${HEADER_FILES} DESTINATION ${ARG_IFCODEGEN_HEADERS_OUTPUT_DIR})
     endif()
 
 endfunction()
@@ -207,25 +207,25 @@ function(qt6_ifcodegen_include target)
     cmake_parse_arguments(
         PARSE_ARGV 1
         ARG
-        "" "QFACE_SOURCES;QFACE_OUTPUT_DIR" ""
+        "" "IFCODEGEN_SOURCES;IFCODEGEN_OUTPUT_DIR" ""
     )
 
     if (DEFINED ARG_KEYWORDS_MISSING_VALUES)
         message(FATAL_ERROR "Keywords can't be empty: ${ARG_KEYWORDS_MISSING_VALUES}")
     endif()
 
-    set(QFACE_OUTPUT_DIR ${ARG_QFACE_OUTPUT_DIR})
-    if (NOT DEFINED ARG_QFACE_OUTPUT_DIR)
-        set(QFACE_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
+    set(IFCODEGEN_OUTPUT_DIR ${ARG_IFCODEGEN_OUTPUT_DIR})
+    if (NOT DEFINED ARG_IFCODEGEN_OUTPUT_DIR)
+        set(IFCODEGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
     endif()
-    if (NOT DEFINED ARG_QFACE_SOURCES)
-        message(FATAL_ERROR "QFACE_SOURCES can't be empty")
+    if (NOT DEFINED ARG_IFCODEGEN_SOURCES)
+        message(FATAL_ERROR "IFCODEGEN_SOURCES can't be empty")
     endif()
-    get_filename_component(QFACE_SOURCES "${ARG_QFACE_SOURCES}" REALPATH BASE_DIR)
-    get_filename_component(QFACE_BASE_NAME "${ARG_QFACE_SOURCES}" NAME_WLE)
+    get_filename_component(IFCODEGEN_SOURCES "${ARG_IFCODEGEN_SOURCES}" REALPATH BASE_DIR)
+    get_filename_component(IFCODEGEN_BASE_NAME "${ARG_IFCODEGEN_SOURCES}" NAME_WLE)
 
     set(CURRENT_TARGET "${target}")
-    include(${QFACE_OUTPUT_DIR}/${QFACE_BASE_NAME}.cmake)
+    include(${IFCODEGEN_OUTPUT_DIR}/${IFCODEGEN_BASE_NAME}.cmake)
 endfunction()
 
 if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS)
diff --git a/src/interfaceframework/doc/src/examples-qface-if-climate.qdoc b/src/interfaceframework/doc/src/examples-qface-if-climate.qdoc
index 2115d0bf..d95c0910 100644
--- a/src/interfaceframework/doc/src/examples-qface-if-climate.qdoc
+++ b/src/interfaceframework/doc/src/examples-qface-if-climate.qdoc
@@ -221,7 +221,7 @@ To call the autogenerator for our shared library, the qmake project file needs t
 \snippet ../../../../examples/interfaceframework/qface-if-climate/frontend/frontend.pro 1
 
 By adding \c ifcodegen to the \c CONFIG variable, the \c ifcodegen feature file is loaded
-and interprets the \c QFACE_SOURCES variable just like the \c SOURCES variable in normal qmake
+and interprets the \c IFCODEGEN_SOURCES variable just like the \c SOURCES variable in normal qmake
 projects.
 
 However, activating the qmake feature using the \c CONFIG variable has one disadvantage: it
@@ -239,7 +239,7 @@ Since the \c frontend library uses the \l {Dynamic Backend System}, we need a co
 \c backend plugin, for the library to provide some functionality. To generate a mock version of
 the backend plugin called "Simulator Backend", you can use the \c backend_simulator template from
 the same IDL file as the \c frontend library. The qmake integration works in the same way, but it
-uses the \c QFACE_FORMAT variable to tell the \c ifcodegen to use a different generation
+uses the \c IFCODEGEN_TEMPLATE variable to tell the \c ifcodegen to use a different generation
 template.
 
 \snippet ../../../../examples/interfaceframework/qface-if-climate/backend_simulator/backend_simulator.pro 2
diff --git a/src/interfaceframework/doc/src/examples-qface-if-remote.qdoc b/src/interfaceframework/doc/src/examples-qface-if-remote.qdoc
index 1c159f96..af71cab2 100644
--- a/src/interfaceframework/doc/src/examples-qface-if-remote.qdoc
+++ b/src/interfaceframework/doc/src/examples-qface-if-remote.qdoc
@@ -87,7 +87,7 @@ To call the autogenerator for our shared library, the qmake project file needs t
 \snippet ../../../../examples/interfaceframework/qface-if-remote/frontend/frontend.pro 1
 
 By adding \c ifcodegen to the \c CONFIG variable, the \c ifcodegen feature file is loaded and
-interprets the \c QFACE_SOURCES variable, similar to the \c SOURCES variable in regular qmake
+interprets the \c IFCODEGEN_SOURCES variable, similar to the \c SOURCES variable in regular qmake
 projects. However, activating the qmake feature via the \c CONFIG variable has one disadvantage: if
 the feature is not available, no errors are reported. We recommend using the following additional
 code to report errors:
@@ -103,7 +103,7 @@ Windows.
 As mentioned above, the \e frontend library uses the \l{Dynamic Backend System}. This means
 that for the library to provide some functionality, we also need a \e backend plugin. The generated
 plugin here works as a client that connects to the server using Qt Remote Objects. The qmake
-integration works in the same way, but it uses the \e QFACE_FORMAT variable to tell the
+integration works in the same way, but it uses the \e IFCODEGEN_TEMPLATE variable to tell the
 \c ifcodegen to use a different generation template, \e backend_qtro:
 
 \snippet ../../../../examples/interfaceframework/qface-if-remote/backend_qtro/backend_qtro.pro 2
diff --git a/src/interfaceframework/doc/src/examples-qface-tutorial.qdoc b/src/interfaceframework/doc/src/examples-qface-tutorial.qdoc
index f5e9c432..d346b13d 100644
--- a/src/interfaceframework/doc/src/examples-qface-tutorial.qdoc
+++ b/src/interfaceframework/doc/src/examples-qface-tutorial.qdoc
@@ -135,7 +135,7 @@
 
     Activating the Interface Framework Generator integration requires the \c CONFIG variable to specify the
     \c ifcodegen option. This makes sure the Interface Framework Generator is called during the build process,
-    using the QFace file that we specify in \c QFACE_SOURCES. For more information, see
+    using the QFace file that we specify in \c IFCODEGEN_SOURCES. For more information, see
     \l{qmake integration}.
 
     To make sure the library we build works on Windows, it's important to add the
@@ -146,7 +146,7 @@
     \section2 Which Files are Autogenerated
 
     The Interface Framework Generator works based on generation templates. These templates define what content
-    should be generated from a QFace file. If no \c QFACE_FORMAT is defined, this automatically
+    should be generated from a QFace file. If no \c IFCODEGEN_TEMPLATE is defined, this automatically
     defaults to "frontend" template. For more details on these templates, see \l{Use the Generator}.
 
     In short, the "frontend" template generates:
@@ -331,7 +331,7 @@
     \printto DESTDIR
     \skipto QT
     \printuntil CONFIG
-    \skipto QFACE_FORMAT
+    \skipto IFCODEGEN_TEMPLATE
     \printto CONFIG += install_ok
 
     Just like for the frontend library, the project file builds a \c lib and defines the library
@@ -341,7 +341,7 @@
     "simulation" one. For more information, see \l{Dynamic Backend System}.
 
     Enabling the Interface Framework Generator is also done in the same way as we did earlier: by using the same
-    \c QFACE_SOURCE variable, but defining \c QFACE_FORMAT to "backend_simulator", to use the
+    \c IFCODEGEN_SOURCE variable, but defining \c IFCODEGEN_TEMPLATE to "backend_simulator", to use the
     correct generation template. In addition, we need to add 'plugin' to the \c CONFIG variable,
     to make this library a Qt plugin which can be easily loaded at runtime.
 
@@ -422,9 +422,9 @@
     \quotefromfile interfaceframework/qface-tutorial/chapter3-simulation-backend/imports/imports.pro
     \printto target.path
 
-    All lines until \c QFACE_SOURCES should be familiar. We use \c CONFIG to build a plugin, then
+    All lines until \c IFCODEGEN_SOURCES should be familiar. We use \c CONFIG to build a plugin, then
     define the settings for the linker to link against our frontend library. Then, we use
-    \c QFACE_FORMAT to define "qmlplugin" as the generation template. Instead of adding
+    \c IFCODEGEN_TEMPLATE to define "qmlplugin" as the generation template. Instead of adding
     \c ifcodegen to \c CONFIG, this time we use
     \l{https://doc.qt.io/qt-5/qmake-test-function-reference.html#load-feature}
     {qmake's load() function} to explicitly load the feature. This enables us to use the \c URI
@@ -620,7 +620,7 @@
     For now we highlight what's changed.
 
     The name of the plugin doesn't end with "_simulation" to indicate that this is a "production"
-    backend. The \c QFACE_FORMAT is now changed to "backend_qtro" to generate a backend that uses
+    backend. The \c IFCODEGEN_TEMPLATE is now changed to "backend_qtro" to generate a backend that uses
     QtRemoteObjects Replicas to connect to a QtRemoteObjects Source that provides the values. In
     addition to a QtRemoteObject-based backend, we also need a QtRemoteObject-based server. This
     part can also be autogenerated using the Interface Framework Generator in a similar fashion:
diff --git a/src/interfaceframework/doc/src/ifcodegen/generator-usage.qdoc b/src/interfaceframework/doc/src/ifcodegen/generator-usage.qdoc
index a54b48f5..981b6c0c 100644
--- a/src/interfaceframework/doc/src/ifcodegen/generator-usage.qdoc
+++ b/src/interfaceframework/doc/src/ifcodegen/generator-usage.qdoc
@@ -58,8 +58,8 @@
             \li Specifies whether the generator should keep track of the changes in the IDL file
                 and update the output on the fly; the default is \c{--no-reload}
         \row
-            \target format
-            \li  \c -f, \c --format
+            \target template
+            \li  \c -t, \c --template
             \li Can be one of the following values:
                 \list
                 \li \c frontend
@@ -96,7 +96,7 @@
             \li Display options and exit.
     \endtable
 
-    Currently, based on the \l{format}{\c {--format}} value, the generator can generate multiple
+    Currently, based on the \l{template}{\c {--template}} value, the generator can generate multiple
     types of projects with a given IDL file:
 
     \table 100%
diff --git a/src/interfaceframework/doc/src/ifcodegen/qmake-integration.qdoc b/src/interfaceframework/doc/src/ifcodegen/qmake-integration.qdoc
index d7597e4a..aa2310df 100644
--- a/src/interfaceframework/doc/src/ifcodegen/qmake-integration.qdoc
+++ b/src/interfaceframework/doc/src/ifcodegen/qmake-integration.qdoc
@@ -46,34 +46,34 @@ CONFIG += ifcodegen
 QT_FOR_CONFIG += interfaceframework
 !qtConfig(ifcodegen): error("No ifcodegen available")
 
-QFACE_FORMAT = frontend
-QFACE_SOURCES = example.qface
-QFACE_MODULE_NAME = myModule
-QFACE_OUTPUT_DIR = myOutputDir
-QFACE_ANNOTATIONS = annotation.yaml
+IFCODEGEN_TEMPLATE = frontend
+IFCODEGEN_SOURCES = example.qface
+IFCODEGEN_MODULE_NAME = myModule
+IFCODEGEN_OUTPUT_DIR = myOutputDir
+IFCODEGEN_ANNOTATIONS = annotation.yaml
 \endcode
 
 The following qmake variables are available:
 \table
     \row
-        \li QFACE_FORMAT
+        \li IFCODEGEN_TEMPLATE
         \li frontend (default), simulator_backend
     \row
-        \li QFACE_SOURCES
+        \li IFCODEGEN_SOURCES
         \li A single \c .qface input file.
     \row
-        \li QFACE_MODULE_NAME
+        \li IFCODEGEN_MODULE_NAME
         \li Optional. The name of the module that is using the generated code.
     \row
-        \li QFACE_OUTPUT_DIR
+        \li IFCODEGEN_OUTPUT_DIR
         \li The output folder where the generated code is placed. The default location is the
             current build folder.
     \row
-        \li QFACE_ANNOTATIONS
+        \li IFCODEGEN_ANNOTATIONS
         \li A list of additional annotation files in YAML format. For more information, see the
             \l{annotations-option}{Annotations Option}.
     \row
-        \li QFACE_IMPORT_PATH
+        \li IFCODEGEN_IMPORT_PATH
         \li A list of import paths, which are considered when an IDL file uses an import statement.
             For more information, see the \l{import-option}{Import Option}.
 \endtable
@@ -113,8 +113,8 @@ QT_FOR_CONFIG += interfaceframework
 
 ...
 
-QFACE_MODULE_NAME = QtIfVehicleFunctions
-QFACE_SOURCES += ifvehiclefunctions.qface
+IFCODEGEN_MODULE_NAME = QtIfVehicleFunctions
+IFCODEGEN_SOURCES += ifvehiclefunctions.qface
 
 load(ifcodegen_qt_module)
 \endcode
diff --git a/src/plugins/ifvehiclefunctions/vehiclefunctions_qtro/CMakeLists.txt b/src/plugins/ifvehiclefunctions/vehiclefunctions_qtro/CMakeLists.txt
index 49aafd0f..6028377a 100644
--- a/src/plugins/ifvehiclefunctions/vehiclefunctions_qtro/CMakeLists.txt
+++ b/src/plugins/ifvehiclefunctions/vehiclefunctions_qtro/CMakeLists.txt
@@ -16,9 +16,9 @@ qt_internal_add_plugin(QtIfVehicleFunctionsQtROPlugin
 
 # Interface Framework Generator:
 qt_ifcodegen(QtIfVehicleFunctionsQtROPlugin
-    QFACE_SOURCES ../../../ifvehiclefunctions/ifvehiclefunctions.qface
-    QFACE_FORMAT backend_qtro
-    QFACE_MODULE_NAME QtIfVehicleFunctions
+    IFCODEGEN_SOURCES ../../../ifvehiclefunctions/ifvehiclefunctions.qface
+    IFCODEGEN_TEMPLATE backend_qtro
+    IFCODEGEN_MODULE_NAME QtIfVehicleFunctions
 )
 
 #### Keys ignored in scope 1:.:.:vehiclefunctions_qtro.pro:<TRUE>:
diff --git a/src/plugins/ifvehiclefunctions/vehiclefunctions_simulator/CMakeLists.txt b/src/plugins/ifvehiclefunctions/vehiclefunctions_simulator/CMakeLists.txt
index af6e180c..a5cdcf91 100644
--- a/src/plugins/ifvehiclefunctions/vehiclefunctions_simulator/CMakeLists.txt
+++ b/src/plugins/ifvehiclefunctions/vehiclefunctions_simulator/CMakeLists.txt
@@ -30,9 +30,9 @@ qt_internal_add_resource(QtIfVehicleFunctionsSimulatorPlugin "qml"
 
 # Interface Framework Generator:
 qt_ifcodegen(QtIfVehicleFunctionsSimulatorPlugin
-    QFACE_SOURCES ../../../ifvehiclefunctions/ifvehiclefunctions.qface
-    QFACE_FORMAT backend_simulator
-    QFACE_MODULE_NAME QtIfVehicleFunctions
+    IFCODEGEN_SOURCES ../../../ifvehiclefunctions/ifvehiclefunctions.qface
+    IFCODEGEN_TEMPLATE backend_simulator
+    IFCODEGEN_MODULE_NAME QtIfVehicleFunctions
 )
 
 #### Keys ignored in scope 1:.:.:vehiclefunctions_simulator.pro:<TRUE>:
diff --git a/src/tools/ifcodegen/CMakeLists.txt b/src/tools/ifcodegen/CMakeLists.txt
index d484b016..93e27172 100644
--- a/src/tools/ifcodegen/CMakeLists.txt
+++ b/src/tools/ifcodegen/CMakeLists.txt
@@ -11,18 +11,18 @@ if(QT_FEATURE_python3_virtualenv AND NOT QT_FEATURE_system_qface)
 
     set(VIRTUALENV_NAME qtif_qface_virtualenv)
     set(VIRTUALENV_PATH ${CMAKE_CURRENT_BINARY_DIR}/${VIRTUALENV_NAME})
-    set(QFACE_SOURCE_DIR ${QtInterfaceFramework_SOURCE_DIR}/src/3rdparty/qface)
+    set(IFCODEGEN_SOURCE_DIR ${QtInterfaceFramework_SOURCE_DIR}/src/3rdparty/qface)
     set(RELOCATE_VIRTUALENV ${QtInterfaceFramework_SOURCE_DIR}/src/3rdparty/virtualenv/relocate_virtualenv.py)
 
     if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
         set(VIRTUALENV_ACTIVATE ${VIRTUALENV_PATH}/Scripts/activate.bat)
         set(VIRTUALENV_ACTIVATE_COMMAND ${VIRTUALENV_ACTIVATE})
-        set(QFACE_BIN ${VIRTUALENV_PATH}/Scripts/qface.exe)
+        set(IFCODEGEN_BIN ${VIRTUALENV_PATH}/Scripts/qface.exe)
         set(DEPLOY_VIRTUALENV ${CMAKE_CURRENT_SOURCE_DIR}/deploy-virtualenv.bat)
     else()
         set(VIRTUALENV_ACTIVATE ${VIRTUALENV_PATH}/bin/activate)
         set(VIRTUALENV_ACTIVATE_COMMAND . ${VIRTUALENV_ACTIVATE})
-        set(QFACE_BIN ${VIRTUALENV_PATH}/bin/qface)
+        set(IFCODEGEN_BIN ${VIRTUALENV_PATH}/bin/qface)
         set(DEPLOY_VIRTUALENV ${CMAKE_CURRENT_SOURCE_DIR}/deploy-virtualenv.sh)
     endif()
 
@@ -45,23 +45,23 @@ if(QT_FEATURE_python3_virtualenv AND NOT QT_FEATURE_system_qface)
 
     # This is not very nice, but it gives us at least a good way to handle virtualenv rebuilding when
     # someone is working on the qface sources
-    file(GLOB_RECURSE QFACE_SOURCE_FILES ${QFACE_SOURCE_DIR}/*.py)
+    file(GLOB_RECURSE IFCODEGEN_SOURCE_FILES ${IFCODEGEN_SOURCE_DIR}/*.py)
 
     # On the CI we use the special wheel folder when available to not download all packages again on each build
     set(PYTHON3_WHEEL_CACHE "$ENV{PYTHON3_WHEEL_CACHE}" CACHE PATH "Python3 wheel cache")
     if (EXISTS "${PYTHON3_WHEEL_CACHE}")
         message(STATUS "Using wheel cache for python package installation: ${PYTHON3_WHEEL_CACHE}")
-        set(PIP3_INSTALL_COMMAND pip3 install --no-index --find-links=${PYTHON3_WHEEL_CACHE} ${QFACE_SOURCE_DIR} --verbose)
+        set(PIP3_INSTALL_COMMAND pip3 install --no-index --find-links=${PYTHON3_WHEEL_CACHE} ${IFCODEGEN_SOURCE_DIR} --verbose)
     else()
-        set(PIP3_INSTALL_COMMAND pip3 install --upgrade ${QFACE_SOURCE_DIR})
+        set(PIP3_INSTALL_COMMAND pip3 install --upgrade ${IFCODEGEN_SOURCE_DIR})
     endif()
 
-    add_custom_command(OUTPUT ${QFACE_BIN}
+    add_custom_command(OUTPUT ${IFCODEGEN_BIN}
                        COMMAND ${VIRTUALENV_ACTIVATE_COMMAND}
                        COMMAND ${PIP3_INSTALL_COMMAND}
                        DEPENDS ${VIRTUALENV_ACTIVATE}
-                               ${QFACE_SOURCE_DIR}/requirements.txt
-                               ${QFACE_SOURCE_FILES}|
+                               ${IFCODEGEN_SOURCE_DIR}/requirements.txt
+                               ${IFCODEGEN_SOURCE_FILES}|
                        COMMENT "Installing qface development version into ${VIRTUALENV_NAME}"
                        )
 
@@ -70,7 +70,7 @@ if(QT_FEATURE_python3_virtualenv AND NOT QT_FEATURE_system_qface)
                        COMMAND ${DEPLOY_VIRTUALENV} qtif_qface_virtualenv
                        COMMAND ${CMAKE_COMMAND} -E touch .stamp-deploy_virtualenv
                        COMMAND ${CMAKE_COMMAND} -E touch .stamp-cmake-rerun
-                       DEPENDS ${QFACE_BIN}
+                       DEPENDS ${IFCODEGEN_BIN}
                       )
 
     # main target which just relies on the stamp file to be uptodate
diff --git a/src/tools/ifcodegen/generate.py b/src/tools/ifcodegen/generate.py
index c56fa08b..7df932be 100755
--- a/src/tools/ifcodegen/generate.py
+++ b/src/tools/ifcodegen/generate.py
@@ -172,8 +172,8 @@ def run(format, moduleConfig, annotations, imports, src, dst):
 @click.option('--reload/--no-reload', default=False, help=
     'Specifies whether the generator should keep track of the changes in the IDL file and update '
     'output on the fly (--no-reload by default).')
-@click.option('--format', '-f', multiple=False, help='The format the autogenerator should use for '
-    'the generation. This can either be one of the builtin formats or a path to a template folder. '
+@click.option('--template', '-t', multiple=False, help='The template the autogenerator should use for '
+    'the generation. This can either be one of the builtin templates or a path to a template folder. '
     'Builtin formats are: \n' + '\n'.join(builtinTemplates))
 @click.option('--module', default=False, help='The name of the Qt module the autogenerator is '
     'generating. This is automatically used by the qmake integration and passed directly to the '
@@ -192,7 +192,7 @@ def run(format, moduleConfig, annotations, imports, src, dst):
 @click.argument('src', nargs=-1, type=click.Path(exists=True))
 @click.argument('dst', nargs=1, type=click.Path(exists=True))
 
-def app(src, dst, format, reload, module, force, annotations, imports):
+def app(src, dst, template, reload, module, force, annotations, imports):
     """
     The QtInterfaceFramework Autogenerator (ifcodegen)
 
@@ -211,7 +211,7 @@ def app(src, dst, format, reload, module, force, annotations, imports):
             "module": module,
             "force": force
         }
-        run(format, moduleConfig, annotations, imports, src, dst)
+        run(template, moduleConfig, annotations, imports, src, dst)
 
 
 if __name__ == '__main__':
diff --git a/src/tools/vehiclefunctions-simulation-server/CMakeLists.txt b/src/tools/vehiclefunctions-simulation-server/CMakeLists.txt
index 6a1008af..39981d25 100644
--- a/src/tools/vehiclefunctions-simulation-server/CMakeLists.txt
+++ b/src/tools/vehiclefunctions-simulation-server/CMakeLists.txt
@@ -36,9 +36,9 @@ qt_internal_add_resource(${target_name} "qml"
 # doesn't exist in this case
 if (TARGET ${target_name})
     qt_ifcodegen(${target_name}
-        QFACE_SOURCES ../../ifvehiclefunctions/ifvehiclefunctions.qface
-        QFACE_FORMAT server_qtro_simulator
-        QFACE_MODULE_NAME QtIfVehicleFunctions
+        IFCODEGEN_SOURCES ../../ifvehiclefunctions/ifvehiclefunctions.qface
+        IFCODEGEN_TEMPLATE server_qtro_simulator
+        IFCODEGEN_MODULE_NAME QtIfVehicleFunctions
     )
 endif()
 
diff --git a/tests/auto/core/ifcodegen/custom-template/CMakeLists.txt b/tests/auto/core/ifcodegen/custom-template/CMakeLists.txt
index 237a3768..beb7d51f 100644
--- a/tests/auto/core/ifcodegen/custom-template/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/custom-template/CMakeLists.txt
@@ -23,8 +23,8 @@ qt_add_executable(tst_custom-template)
 
 # Interface Framework Generator:
 qt6_ifcodegen(tst_custom-template
-    QFACE_SOURCES ../org.example.echo.qface
-    QFACE_FORMAT custom-test
+    IFCODEGEN_SOURCES ../org.example.echo.qface
+    IFCODEGEN_TEMPLATE custom-test
 )
 set_target_properties(tst_custom-template PROPERTIES
     WIN32_EXECUTABLE TRUE
diff --git a/tests/auto/core/ifcodegen/custom-template/custom-template.pro b/tests/auto/core/ifcodegen/custom-template/custom-template.pro
index 0e622a6a..9bb81e37 100644
--- a/tests/auto/core/ifcodegen/custom-template/custom-template.pro
+++ b/tests/auto/core/ifcodegen/custom-template/custom-template.pro
@@ -3,5 +3,5 @@ TARGET = tst_custom-template
 QT += testlib
 CONFIG += c++11 ifcodegen testcase
 
-QFACE_FORMAT = $$PWD/custom-test
-QFACE_SOURCES = ../org.example.echo.qface
+IFCODEGEN_TEMPLATE = $$PWD/custom-test
+IFCODEGEN_SOURCES = ../org.example.echo.qface
diff --git a/tests/auto/core/ifcodegen/include-test/backend_qtro/CMakeLists.txt b/tests/auto/core/ifcodegen/include-test/backend_qtro/CMakeLists.txt
index 5da55e67..6a5d2a7e 100644
--- a/tests/auto/core/ifcodegen/include-test/backend_qtro/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/include-test/backend_qtro/CMakeLists.txt
@@ -9,9 +9,9 @@ qt_add_plugin(include_test_qtro)
 
 # Interface Framework Generator:
 qt6_ifcodegen(include_test_qtro
-    QFACE_SOURCES ../../include-test.qface
-    QFACE_FORMAT backend_qtro
-    QFACE_IMPORT_PATH ../../qface\ imports
+    IFCODEGEN_SOURCES ../../include-test.qface
+    IFCODEGEN_TEMPLATE backend_qtro
+    IFCODEGEN_IMPORT_PATH ../../qface\ imports
 )
 
 target_link_libraries(include_test_qtro PUBLIC
diff --git a/tests/auto/core/ifcodegen/include-test/backend_qtro/backend_qtro.pro b/tests/auto/core/ifcodegen/include-test/backend_qtro/backend_qtro.pro
index 7691f8f2..ce35d803 100644
--- a/tests/auto/core/ifcodegen/include-test/backend_qtro/backend_qtro.pro
+++ b/tests/auto/core/ifcodegen/include-test/backend_qtro/backend_qtro.pro
@@ -11,6 +11,6 @@ PLUGIN_CLASS_NAME = IncludeTestQtROPlugin
 
 QT += core interfaceframework
 
-QFACE_FORMAT = backend_qtro
-QFACE_SOURCES = ../../include-test.qface
-QFACE_IMPORT_PATH += "../../qface imports"
+IFCODEGEN_TEMPLATE = backend_qtro
+IFCODEGEN_SOURCES = ../../include-test.qface
+IFCODEGEN_IMPORT_PATH += "../../qface imports"
diff --git a/tests/auto/core/ifcodegen/include-test/backend_simulator/CMakeLists.txt b/tests/auto/core/ifcodegen/include-test/backend_simulator/CMakeLists.txt
index b45765e4..77f9302a 100644
--- a/tests/auto/core/ifcodegen/include-test/backend_simulator/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/include-test/backend_simulator/CMakeLists.txt
@@ -10,9 +10,9 @@ set_target_properties(include_test_simulator PROPERTIES LIBRARY_OUTPUT_DIRECTORY
 
 # Interface Framework Generator:
 qt6_ifcodegen(include_test_simulator
-    QFACE_SOURCES ../../include-test.qface
-    QFACE_FORMAT backend_simulator
-    QFACE_IMPORT_PATH ../../qface\ imports
+    IFCODEGEN_SOURCES ../../include-test.qface
+    IFCODEGEN_TEMPLATE backend_simulator
+    IFCODEGEN_IMPORT_PATH ../../qface\ imports
 )
 
 target_link_libraries(include_test_simulator PUBLIC
diff --git a/tests/auto/core/ifcodegen/include-test/backend_simulator/backend_simulator.pro b/tests/auto/core/ifcodegen/include-test/backend_simulator/backend_simulator.pro
index 89d95682..aa62c85a 100644
--- a/tests/auto/core/ifcodegen/include-test/backend_simulator/backend_simulator.pro
+++ b/tests/auto/core/ifcodegen/include-test/backend_simulator/backend_simulator.pro
@@ -11,6 +11,6 @@ PLUGIN_CLASS_NAME = IncludeTestSimulatorPlugin
 
 QT += core interfaceframework
 
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../../include-test.qface
-QFACE_IMPORT_PATH += "../../qface imports"
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../../include-test.qface
+IFCODEGEN_IMPORT_PATH += "../../qface imports"
diff --git a/tests/auto/core/ifcodegen/include-test/common/CMakeLists.txt b/tests/auto/core/ifcodegen/include-test/common/CMakeLists.txt
index 9fc07416..1744f42d 100644
--- a/tests/auto/core/ifcodegen/include-test/common/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/include-test/common/CMakeLists.txt
@@ -10,8 +10,8 @@ set_target_properties(include_test_common PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..
 
 # Interface Framework Generator:
 qt6_ifcodegen(include_test_common
-    QFACE_SOURCES ../../qface\ imports/common.qface
-    QFACE_FORMAT frontend
+    IFCODEGEN_SOURCES ../../qface\ imports/common.qface
+    IFCODEGEN_TEMPLATE frontend
 )
 target_include_directories(include_test_common PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/tests/auto/core/ifcodegen/include-test/common/common.pro b/tests/auto/core/ifcodegen/include-test/common/common.pro
index 4ca407b8..f2610987 100644
--- a/tests/auto/core/ifcodegen/include-test/common/common.pro
+++ b/tests/auto/core/ifcodegen/include-test/common/common.pro
@@ -10,5 +10,5 @@ DEFINES += QT_BUILD_COMMON_LIB
 
 macos: QMAKE_SONAME_PREFIX = @rpath
 
-QFACE_SOURCES = "../../qface imports/common.qface"
+IFCODEGEN_SOURCES = "../../qface imports/common.qface"
 
diff --git a/tests/auto/core/ifcodegen/include-test/frontend/CMakeLists.txt b/tests/auto/core/ifcodegen/include-test/frontend/CMakeLists.txt
index a03d776a..c02bee8f 100644
--- a/tests/auto/core/ifcodegen/include-test/frontend/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/include-test/frontend/CMakeLists.txt
@@ -10,9 +10,9 @@ set_target_properties(include_test_frontend PROPERTIES RUNTIME_OUTPUT_DIRECTORY
 
 # Interface Framework Generator:
 qt6_ifcodegen(include_test_frontend
-    QFACE_SOURCES ../../include-test.qface
-    QFACE_FORMAT frontend
-    QFACE_IMPORT_PATH ../../qface\ imports
+    IFCODEGEN_SOURCES ../../include-test.qface
+    IFCODEGEN_TEMPLATE frontend
+    IFCODEGEN_IMPORT_PATH ../../qface\ imports
 )
 target_include_directories(include_test_frontend PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/tests/auto/core/ifcodegen/include-test/frontend/frontend.pro b/tests/auto/core/ifcodegen/include-test/frontend/frontend.pro
index 22617574..9e16a134 100644
--- a/tests/auto/core/ifcodegen/include-test/frontend/frontend.pro
+++ b/tests/auto/core/ifcodegen/include-test/frontend/frontend.pro
@@ -12,6 +12,6 @@ LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(include_test_common)
 
 macos: QMAKE_SONAME_PREFIX = @rpath
 
-QFACE_SOURCES = ../../include-test.qface
-QFACE_IMPORT_PATH += "../../qface imports"
+IFCODEGEN_SOURCES = ../../include-test.qface
+IFCODEGEN_IMPORT_PATH += "../../qface imports"
 
diff --git a/tests/auto/core/ifcodegen/include-test/qmlplugin/CMakeLists.txt b/tests/auto/core/ifcodegen/include-test/qmlplugin/CMakeLists.txt
index 6cea695c..74907fe2 100644
--- a/tests/auto/core/ifcodegen/include-test/qmlplugin/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/include-test/qmlplugin/CMakeLists.txt
@@ -7,9 +7,9 @@ set(CMAKE_AUTOUIC ON)
 
 # Interface Framework Generator:
 qt6_ifcodegen(qmlplugin
-    QFACE_SOURCES ../../include-test.qface
-    QFACE_FORMAT qmlplugin
-    QFACE_IMPORT_PATH ../../qface\ imports
+    IFCODEGEN_SOURCES ../../include-test.qface
+    IFCODEGEN_TEMPLATE qmlplugin
+    IFCODEGEN_IMPORT_PATH ../../qface\ imports
 )
 
 target_link_libraries(qmlplugin PRIVATE
diff --git a/tests/auto/core/ifcodegen/include-test/qmlplugin/qmlplugin.pro b/tests/auto/core/ifcodegen/include-test/qmlplugin/qmlplugin.pro
index ee8cc1f4..6e4fd4ca 100644
--- a/tests/auto/core/ifcodegen/include-test/qmlplugin/qmlplugin.pro
+++ b/tests/auto/core/ifcodegen/include-test/qmlplugin/qmlplugin.pro
@@ -5,8 +5,8 @@ CONFIG += c++11 plugin
 INCLUDEPATH += $$OUT_PWD/../frontend $$OUT_PWD/../common
 LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(include_test_frontend) -l$$qtLibraryTarget(include_test_common)
 
-QFACE_FORMAT = qmlplugin
-QFACE_SOURCES = ../../include-test.qface
-QFACE_IMPORT_PATH += "../../qface imports"
+IFCODEGEN_TEMPLATE = qmlplugin
+IFCODEGEN_SOURCES = ../../include-test.qface
+IFCODEGEN_IMPORT_PATH += "../../qface imports"
 
 load(ifcodegen)
diff --git a/tests/auto/core/ifcodegen/include-test/simulation_server_qtro/CMakeLists.txt b/tests/auto/core/ifcodegen/include-test/simulation_server_qtro/CMakeLists.txt
index 1c8f9f70..7f42a328 100644
--- a/tests/auto/core/ifcodegen/include-test/simulation_server_qtro/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/include-test/simulation_server_qtro/CMakeLists.txt
@@ -9,9 +9,9 @@ qt_add_executable(include-test-simulation-server)
 
 # Interface Framework Generator:
 qt6_ifcodegen(include-test-simulation-server
-    QFACE_SOURCES ../../include-test.qface
-    QFACE_FORMAT server_qtro_simulator
-    QFACE_IMPORT_PATH ../../qface\ imports
+    IFCODEGEN_SOURCES ../../include-test.qface
+    IFCODEGEN_TEMPLATE server_qtro_simulator
+    IFCODEGEN_IMPORT_PATH ../../qface\ imports
 )
 
 target_link_libraries(include-test-simulation-server PUBLIC
diff --git a/tests/auto/core/ifcodegen/include-test/simulation_server_qtro/simulation_server_qtro.pro b/tests/auto/core/ifcodegen/include-test/simulation_server_qtro/simulation_server_qtro.pro
index ab6df4d1..0eed86f0 100644
--- a/tests/auto/core/ifcodegen/include-test/simulation_server_qtro/simulation_server_qtro.pro
+++ b/tests/auto/core/ifcodegen/include-test/simulation_server_qtro/simulation_server_qtro.pro
@@ -11,6 +11,6 @@ INCLUDEPATH += $$OUT_PWD/../frontend $$OUT_PWD/../common
 
 QT += qml quick core interfaceframework
 
-QFACE_FORMAT = server_qtro_simulator
-QFACE_SOURCES = ../../include-test.qface
-QFACE_IMPORT_PATH += "../../qface imports"
+IFCODEGEN_TEMPLATE = server_qtro_simulator
+IFCODEGEN_SOURCES = ../../include-test.qface
+IFCODEGEN_IMPORT_PATH += "../../qface imports"
diff --git a/tests/auto/core/ifcodegen/include-test/test/CMakeLists.txt b/tests/auto/core/ifcodegen/include-test/test/CMakeLists.txt
index 523d4289..277cc170 100644
--- a/tests/auto/core/ifcodegen/include-test/test/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/include-test/test/CMakeLists.txt
@@ -20,7 +20,7 @@ set_target_properties(tst_qface_include PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../)
 
 # Interface Framework Generator:
 qt6_ifcodegen(tst_qface_include
-    QFACE_SOURCES ../../include-test.qface
-    QFACE_FORMAT test
-    QFACE_IMPORT_PATH ../../qface\ imports
+    IFCODEGEN_SOURCES ../../include-test.qface
+    IFCODEGEN_TEMPLATE test
+    IFCODEGEN_IMPORT_PATH ../../qface\ imports
 )
diff --git a/tests/auto/core/ifcodegen/include-test/test/test.pro b/tests/auto/core/ifcodegen/include-test/test/test.pro
index d69bda43..146c2ddb 100644
--- a/tests/auto/core/ifcodegen/include-test/test/test.pro
+++ b/tests/auto/core/ifcodegen/include-test/test/test.pro
@@ -10,6 +10,6 @@ LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(include_test_frontend) -l$$qtLibraryT
 
 QMAKE_RPATHDIR += $$OUT_PWD/..
 
-QFACE_FORMAT = test
-QFACE_SOURCES = ../../include-test.qface
-QFACE_IMPORT_PATH += "../../qface imports"
+IFCODEGEN_TEMPLATE = test
+IFCODEGEN_SOURCES = ../../include-test.qface
+IFCODEGEN_IMPORT_PATH += "../../qface imports"
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_qtro/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_qtro/CMakeLists.txt
index 0d5e8402..f9ecb6a3 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_qtro/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_qtro/CMakeLists.txt
@@ -9,8 +9,8 @@ qt_add_plugin(echo_noanno_qtro)
 
 # Interface Framework Generator:
 qt6_ifcodegen(echo_noanno_qtro
-    QFACE_SOURCES ../../org.example.echo.noannotation.qface
-    QFACE_FORMAT backend_qtro
+    IFCODEGEN_SOURCES ../../org.example.echo.noannotation.qface
+    IFCODEGEN_TEMPLATE backend_qtro
 )
 
 target_link_libraries(echo_noanno_qtro PUBLIC
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_qtro/backend_qtro.pro b/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_qtro/backend_qtro.pro
index 81ab4ac9..f919a914 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_qtro/backend_qtro.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_qtro/backend_qtro.pro
@@ -11,5 +11,5 @@ PLUGIN_CLASS_NAME = EchoQtROPlugin
 
 QT += core interfaceframework
 
-QFACE_FORMAT = backend_qtro
-QFACE_SOURCES = ../../org.example.echo.noannotation.qface
+IFCODEGEN_TEMPLATE = backend_qtro
+IFCODEGEN_SOURCES = ../../org.example.echo.noannotation.qface
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_simulator/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_simulator/CMakeLists.txt
index 1fe05d8c..bcf3752b 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_simulator/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_simulator/CMakeLists.txt
@@ -10,8 +10,8 @@ set_target_properties(echo_noanno_simulator PROPERTIES LIBRARY_OUTPUT_DIRECTORY
 
 # Interface Framework Generator:
 qt6_ifcodegen(echo_noanno_simulator
-    QFACE_SOURCES ../../org.example.echo.noannotation.qface
-    QFACE_FORMAT backend_simulator
+    IFCODEGEN_SOURCES ../../org.example.echo.noannotation.qface
+    IFCODEGEN_TEMPLATE backend_simulator
 )
 
 target_link_libraries(echo_noanno_simulator PUBLIC
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_simulator/backend_simulator.pro b/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_simulator/backend_simulator.pro
index 064dd793..dfc5019c 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_simulator/backend_simulator.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo-noanno/backend_simulator/backend_simulator.pro
@@ -11,5 +11,5 @@ PLUGIN_CLASS_NAME = EchoSimulatorPlugin
 
 QT += core interfaceframework
 
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../../org.example.echo.noannotation.qface
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../../org.example.echo.noannotation.qface
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noanno/frontend/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo-noanno/frontend/CMakeLists.txt
index 9e8c26b8..d5a2a57e 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noanno/frontend/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo-noanno/frontend/CMakeLists.txt
@@ -10,8 +10,8 @@ set_target_properties(echo_noanno_frontend PROPERTIES RUNTIME_OUTPUT_DIRECTORY .
 
 # Interface Framework Generator:
 qt6_ifcodegen(echo_noanno_frontend
-    QFACE_SOURCES ../../org.example.echo.noannotation.qface
-    QFACE_FORMAT frontend
+    IFCODEGEN_SOURCES ../../org.example.echo.noannotation.qface
+    IFCODEGEN_TEMPLATE frontend
 )
 target_include_directories(echo_noanno_frontend PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noanno/frontend/frontend.pro b/tests/auto/core/ifcodegen/org-example-echo-noanno/frontend/frontend.pro
index a92a4c2d..05522c3c 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noanno/frontend/frontend.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo-noanno/frontend/frontend.pro
@@ -10,5 +10,5 @@ DEFINES += QT_BUILD_ORG_EXAMPLE_ECHO_LIB
 
 macos: QMAKE_SONAME_PREFIX = @rpath
 
-QFACE_SOURCES = ../../org.example.echo.noannotation.qface
+IFCODEGEN_SOURCES = ../../org.example.echo.noannotation.qface
 
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noanno/qmlplugin/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo-noanno/qmlplugin/CMakeLists.txt
index c87027f3..69e5d058 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noanno/qmlplugin/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo-noanno/qmlplugin/CMakeLists.txt
@@ -7,8 +7,8 @@ set(CMAKE_AUTOUIC ON)
 
 # Interface Framework Generator:
 qt6_ifcodegen(echo_frontend_noanno_qmlplugin # special case
-    QFACE_SOURCES ../../org.example.echo.noannotation.qface
-    QFACE_FORMAT qmlplugin
+    IFCODEGEN_SOURCES ../../org.example.echo.noannotation.qface
+    IFCODEGEN_TEMPLATE qmlplugin
 )
 
 target_link_libraries(echo_frontend_noanno_qmlplugin PRIVATE # special case
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noanno/qmlplugin/qmlplugin.pro b/tests/auto/core/ifcodegen/org-example-echo-noanno/qmlplugin/qmlplugin.pro
index b9da194f..d1fc6ced 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noanno/qmlplugin/qmlplugin.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo-noanno/qmlplugin/qmlplugin.pro
@@ -5,7 +5,7 @@ CONFIG += c++11 plugin
 INCLUDEPATH += $$OUT_PWD/../frontend
 LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noannotation_frontend)
 
-QFACE_FORMAT = qmlplugin
-QFACE_SOURCES = ../../org.example.echo.noannotation.qface
+IFCODEGEN_TEMPLATE = qmlplugin
+IFCODEGEN_SOURCES = ../../org.example.echo.noannotation.qface
 
 load(ifcodegen)
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noanno/simulation_server_qtro/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo-noanno/simulation_server_qtro/CMakeLists.txt
index 80cfaf4c..3fe59b95 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noanno/simulation_server_qtro/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo-noanno/simulation_server_qtro/CMakeLists.txt
@@ -9,8 +9,8 @@ qt_add_executable(org-example-echo-noanno-simu-server)
 
 # Interface Framework Generator:
 qt6_ifcodegen(org-example-echo-noanno-simu-server
-    QFACE_SOURCES ../../org.example.echo.noannotation.qface
-    QFACE_FORMAT server_qtro_simulator
+    IFCODEGEN_SOURCES ../../org.example.echo.noannotation.qface
+    IFCODEGEN_TEMPLATE server_qtro_simulator
 )
 
 target_link_libraries(org-example-echo-noanno-simu-server PUBLIC
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noanno/simulation_server_qtro/simulation_server_qtro.pro b/tests/auto/core/ifcodegen/org-example-echo-noanno/simulation_server_qtro/simulation_server_qtro.pro
index f87303f1..c197c590 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noanno/simulation_server_qtro/simulation_server_qtro.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo-noanno/simulation_server_qtro/simulation_server_qtro.pro
@@ -12,5 +12,5 @@ INCLUDEPATH += $$OUT_PWD/../frontend
 
 QT += qml quick core interfaceframework
 
-QFACE_FORMAT = server_qtro_simulator
-QFACE_SOURCES = ../../org.example.echo.noannotation.qface
+IFCODEGEN_TEMPLATE = server_qtro_simulator
+IFCODEGEN_SOURCES = ../../org.example.echo.noannotation.qface
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noanno/test/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo-noanno/test/CMakeLists.txt
index 84a9e7e2..df43f70c 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noanno/test/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo-noanno/test/CMakeLists.txt
@@ -19,6 +19,6 @@ set_target_properties(tst_org-example-echo-noanno PROPERTIES RUNTIME_OUTPUT_DIRE
 
 # Interface Framework Generator:
 qt6_ifcodegen(tst_org-example-echo-noanno
-    QFACE_SOURCES ../../org.example.echo.noannotation.qface
-    QFACE_FORMAT test
+    IFCODEGEN_SOURCES ../../org.example.echo.noannotation.qface
+    IFCODEGEN_TEMPLATE test
 )
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noanno/test/test.pro b/tests/auto/core/ifcodegen/org-example-echo-noanno/test/test.pro
index f8a2c5ab..a5594d3b 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noanno/test/test.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo-noanno/test/test.pro
@@ -10,5 +10,5 @@ LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noannotation_frontend)
 
 QMAKE_RPATHDIR += $$OUT_PWD/..
 
-QFACE_FORMAT = test
-QFACE_SOURCES = ../../org.example.echo.noannotation.qface
+IFCODEGEN_TEMPLATE = test
+IFCODEGEN_SOURCES = ../../org.example.echo.noannotation.qface
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noprivate/backend_simulator/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo-noprivate/backend_simulator/CMakeLists.txt
index 2a1856c0..8f2c4ed7 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noprivate/backend_simulator/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo-noprivate/backend_simulator/CMakeLists.txt
@@ -10,9 +10,9 @@ set_target_properties(echo_noprivate_simulator PROPERTIES LIBRARY_OUTPUT_DIRECTO
 
 # Interface Framework Generator:
 qt6_ifcodegen(echo_noprivate_simulator
-    QFACE_SOURCES ../../org.example.echo.qface
-    QFACE_FORMAT backend_simulator
-    QFACE_ANNOTATIONS ../../no-private.yaml
+    IFCODEGEN_SOURCES ../../org.example.echo.qface
+    IFCODEGEN_TEMPLATE backend_simulator
+    IFCODEGEN_ANNOTATIONS ../../no-private.yaml
 )
 
 target_link_libraries(echo_noprivate_simulator PUBLIC
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noprivate/backend_simulator/backend_simulator.pro b/tests/auto/core/ifcodegen/org-example-echo-noprivate/backend_simulator/backend_simulator.pro
index 29751973..402cc00a 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noprivate/backend_simulator/backend_simulator.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo-noprivate/backend_simulator/backend_simulator.pro
@@ -11,6 +11,6 @@ PLUGIN_CLASS_NAME = EchoSimulatorPlugin
 
 QT += core interfaceframework
 
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../../org.example.echo.qface
-QFACE_ANNOTATIONS += ../../no-private.yaml
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../../org.example.echo.qface
+IFCODEGEN_ANNOTATIONS += ../../no-private.yaml
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noprivate/frontend/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo-noprivate/frontend/CMakeLists.txt
index e09ff192..f09de190 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noprivate/frontend/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo-noprivate/frontend/CMakeLists.txt
@@ -10,9 +10,9 @@ set_target_properties(echo_noprivate_frontend PROPERTIES RUNTIME_OUTPUT_DIRECTOR
 
 # Interface Framework Generator:
 qt6_ifcodegen(echo_noprivate_frontend
-    QFACE_SOURCES ../../org.example.echo.qface
-    QFACE_FORMAT frontend
-    QFACE_ANNOTATIONS ../../no-private.yaml
+    IFCODEGEN_SOURCES ../../org.example.echo.qface
+    IFCODEGEN_TEMPLATE frontend
+    IFCODEGEN_ANNOTATIONS ../../no-private.yaml
 )
 target_include_directories(echo_noprivate_frontend PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noprivate/frontend/frontend.pro b/tests/auto/core/ifcodegen/org-example-echo-noprivate/frontend/frontend.pro
index c305fc6e..e1b8ecd6 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noprivate/frontend/frontend.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo-noprivate/frontend/frontend.pro
@@ -10,6 +10,6 @@ DEFINES += QT_BUILD_ORG_EXAMPLE_ECHO_LIB
 
 macos: QMAKE_SONAME_PREFIX = @rpath
 
-QFACE_SOURCES = ../../org.example.echo.qface
-QFACE_ANNOTATIONS += ../../no-private.yaml
+IFCODEGEN_SOURCES = ../../org.example.echo.qface
+IFCODEGEN_ANNOTATIONS += ../../no-private.yaml
 
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noprivate/qmlplugin/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo-noprivate/qmlplugin/CMakeLists.txt
index 2d3f70d8..7e1fac5b 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noprivate/qmlplugin/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo-noprivate/qmlplugin/CMakeLists.txt
@@ -7,9 +7,9 @@ set(CMAKE_AUTOUIC ON)
 
 # Interface Framework Generator:
 qt6_ifcodegen(echo_frontend_noprivate_qmlplugin # special case
-    QFACE_SOURCES ../../org.example.echo.qface
-    QFACE_FORMAT qmlplugin
-    QFACE_ANNOTATIONS ../../no-private.yaml
+    IFCODEGEN_SOURCES ../../org.example.echo.qface
+    IFCODEGEN_TEMPLATE qmlplugin
+    IFCODEGEN_ANNOTATIONS ../../no-private.yaml
 )
 
 target_link_libraries(echo_frontend_noprivate_qmlplugin PRIVATE # special case
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noprivate/qmlplugin/qmlplugin.pro b/tests/auto/core/ifcodegen/org-example-echo-noprivate/qmlplugin/qmlplugin.pro
index 93935a14..0e0b40ed 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noprivate/qmlplugin/qmlplugin.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo-noprivate/qmlplugin/qmlplugin.pro
@@ -5,8 +5,8 @@ CONFIG += c++11 plugin
 INCLUDEPATH += $$OUT_PWD/../frontend
 LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noprivate_frontend)
 
-QFACE_FORMAT = qmlplugin
-QFACE_SOURCES = ../../org.example.echo.qface
-QFACE_ANNOTATIONS += ../../no-private.yaml
+IFCODEGEN_TEMPLATE = qmlplugin
+IFCODEGEN_SOURCES = ../../org.example.echo.qface
+IFCODEGEN_ANNOTATIONS += ../../no-private.yaml
 
 load(ifcodegen)
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noprivate/test/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo-noprivate/test/CMakeLists.txt
index 73ddac3c..154a83bc 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noprivate/test/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo-noprivate/test/CMakeLists.txt
@@ -19,7 +19,7 @@ set_target_properties(tst_org-example-echo-noprivate PROPERTIES RUNTIME_OUTPUT_D
 
 # Interface Framework Generator:
 qt6_ifcodegen(tst_org-example-echo-noprivate
-    QFACE_SOURCES ../../org.example.echo.qface
-    QFACE_FORMAT test
-    QFACE_ANNOTATIONS ../../no-private.yaml
+    IFCODEGEN_SOURCES ../../org.example.echo.qface
+    IFCODEGEN_TEMPLATE test
+    IFCODEGEN_ANNOTATIONS ../../no-private.yaml
 )
diff --git a/tests/auto/core/ifcodegen/org-example-echo-noprivate/test/test.pro b/tests/auto/core/ifcodegen/org-example-echo-noprivate/test/test.pro
index 09d93151..ac76704c 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-noprivate/test/test.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo-noprivate/test/test.pro
@@ -10,6 +10,6 @@ LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_noprivate_frontend)
 
 QMAKE_RPATHDIR += $$OUT_PWD/..
 
-QFACE_FORMAT = test
-QFACE_SOURCES = ../../org.example.echo.qface
-QFACE_ANNOTATIONS += ../../no-private.yaml
+IFCODEGEN_TEMPLATE = test
+IFCODEGEN_SOURCES = ../../org.example.echo.qface
+IFCODEGEN_ANNOTATIONS += ../../no-private.yaml
diff --git a/tests/auto/core/ifcodegen/org-example-echo-qtro/backend_qtro/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo-qtro/backend_qtro/CMakeLists.txt
index 9f28dfd2..9b251dff 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-qtro/backend_qtro/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo-qtro/backend_qtro/CMakeLists.txt
@@ -10,8 +10,8 @@ set_target_properties(echo_backend_qtro PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../i
 
 # Interface Framework Generator:
 qt6_ifcodegen(echo_backend_qtro
-    QFACE_SOURCES ../../org.example.echo.qface
-    QFACE_FORMAT backend_qtro
+    IFCODEGEN_SOURCES ../../org.example.echo.qface
+    IFCODEGEN_TEMPLATE backend_qtro
 )
 
 target_link_libraries(echo_backend_qtro PUBLIC
diff --git a/tests/auto/core/ifcodegen/org-example-echo-qtro/backend_qtro/backend_qtro.pro b/tests/auto/core/ifcodegen/org-example-echo-qtro/backend_qtro/backend_qtro.pro
index 6e2ecad2..093cf68c 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-qtro/backend_qtro/backend_qtro.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo-qtro/backend_qtro/backend_qtro.pro
@@ -13,5 +13,5 @@ QT += core interfaceframework
 
 macos: QMAKE_SONAME_PREFIX = @rpath
 
-QFACE_FORMAT = backend_qtro
-QFACE_SOURCES = ../../org.example.echo.qface
+IFCODEGEN_TEMPLATE = backend_qtro
+IFCODEGEN_SOURCES = ../../org.example.echo.qface
diff --git a/tests/auto/core/ifcodegen/org-example-echo-qtro/frontend/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo-qtro/frontend/CMakeLists.txt
index 6c6f856e..eb5b527e 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-qtro/frontend/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo-qtro/frontend/CMakeLists.txt
@@ -10,8 +10,8 @@ set_target_properties(echo_qtro_frontend PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../
 
 # Interface Framework Generator:
 qt6_ifcodegen(echo_qtro_frontend
-    QFACE_SOURCES ../../org.example.echo.qface
-    QFACE_FORMAT frontend
+    IFCODEGEN_SOURCES ../../org.example.echo.qface
+    IFCODEGEN_TEMPLATE frontend
 )
 target_include_directories(echo_qtro_frontend PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/tests/auto/core/ifcodegen/org-example-echo-qtro/frontend/frontend.pro b/tests/auto/core/ifcodegen/org-example-echo-qtro/frontend/frontend.pro
index 6b448b57..386286a3 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-qtro/frontend/frontend.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo-qtro/frontend/frontend.pro
@@ -10,4 +10,4 @@ DEFINES += QT_BUILD_ORG_EXAMPLE_ECHO_LIB
 
 macos: QMAKE_SONAME_PREFIX = @rpath
 
-QFACE_SOURCES = ../../org.example.echo.qface
+IFCODEGEN_SOURCES = ../../org.example.echo.qface
diff --git a/tests/auto/core/ifcodegen/org-example-echo-qtro/server_qtro_test/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo-qtro/server_qtro_test/CMakeLists.txt
index 1a0176d1..abacde4d 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-qtro/server_qtro_test/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo-qtro/server_qtro_test/CMakeLists.txt
@@ -24,6 +24,6 @@ set_target_properties(tst_org-example-echo-qtro PROPERTIES RUNTIME_OUTPUT_DIRECT
 
 # Interface Framework Generator:
 qt6_ifcodegen(tst_org-example-echo-qtro
-    QFACE_SOURCES ../../org.example.echo.qface
-    QFACE_FORMAT server_qtro
+    IFCODEGEN_SOURCES ../../org.example.echo.qface
+    IFCODEGEN_TEMPLATE server_qtro
 )
diff --git a/tests/auto/core/ifcodegen/org-example-echo-qtro/server_qtro_test/server_qtro_test.pro b/tests/auto/core/ifcodegen/org-example-echo-qtro/server_qtro_test/server_qtro_test.pro
index daeaf997..eb951978 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-qtro/server_qtro_test/server_qtro_test.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo-qtro/server_qtro_test/server_qtro_test.pro
@@ -19,8 +19,8 @@ SOURCES += main.cpp \
     echozonedservice.cpp \
     contactsmodelservice.cpp
 
-QFACE_FORMAT = server_qtro
-QFACE_SOURCES = ../../org.example.echo.qface
+IFCODEGEN_TEMPLATE = server_qtro
+IFCODEGEN_SOURCES = ../../org.example.echo.qface
 
 HEADERS += \
     server.h \
diff --git a/tests/auto/core/ifcodegen/org-example-echo-qtro/simulation_server_qtro/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo-qtro/simulation_server_qtro/CMakeLists.txt
index e95f80e4..aac0ea7a 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-qtro/simulation_server_qtro/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo-qtro/simulation_server_qtro/CMakeLists.txt
@@ -9,8 +9,8 @@ qt_add_executable(org-example-echo-qtro-simulation-server)
 
 # Interface Framework Generator:
 qt6_ifcodegen(org-example-echo-qtro-simulation-server
-    QFACE_SOURCES ../../org.example.echo.qface
-    QFACE_FORMAT server_qtro_simulator
+    IFCODEGEN_SOURCES ../../org.example.echo.qface
+    IFCODEGEN_TEMPLATE server_qtro_simulator
 )
 
 target_link_libraries(org-example-echo-qtro-simulation-server PUBLIC
diff --git a/tests/auto/core/ifcodegen/org-example-echo-qtro/simulation_server_qtro/simulation_server_qtro.pro b/tests/auto/core/ifcodegen/org-example-echo-qtro/simulation_server_qtro/simulation_server_qtro.pro
index bc863f7f..87d5e7a3 100644
--- a/tests/auto/core/ifcodegen/org-example-echo-qtro/simulation_server_qtro/simulation_server_qtro.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo-qtro/simulation_server_qtro/simulation_server_qtro.pro
@@ -12,5 +12,5 @@ INCLUDEPATH += $$OUT_PWD/../frontend
 
 QT += qml quick core interfaceframework
 
-QFACE_FORMAT = server_qtro_simulator
-QFACE_SOURCES = ../../org.example.echo.qface
+IFCODEGEN_TEMPLATE = server_qtro_simulator
+IFCODEGEN_SOURCES = ../../org.example.echo.qface
diff --git a/tests/auto/core/ifcodegen/org-example-echo/backend_simulator/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo/backend_simulator/CMakeLists.txt
index fac0af1b..a0dec7f5 100644
--- a/tests/auto/core/ifcodegen/org-example-echo/backend_simulator/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo/backend_simulator/CMakeLists.txt
@@ -13,8 +13,8 @@ target_sources(echo_simulator PRIVATE
 
 # Interface Framework Generator:
 qt6_ifcodegen(echo_simulator
-    QFACE_SOURCES ../../org.example.echo.qface
-    QFACE_FORMAT backend_simulator
+    IFCODEGEN_SOURCES ../../org.example.echo.qface
+    IFCODEGEN_TEMPLATE backend_simulator
 )
 
 target_link_libraries(echo_simulator PUBLIC
diff --git a/tests/auto/core/ifcodegen/org-example-echo/backend_simulator/backend_simulator.pro b/tests/auto/core/ifcodegen/org-example-echo/backend_simulator/backend_simulator.pro
index bab3383b..63703914 100644
--- a/tests/auto/core/ifcodegen/org-example-echo/backend_simulator/backend_simulator.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo/backend_simulator/backend_simulator.pro
@@ -11,7 +11,7 @@ PLUGIN_CLASS_NAME = EchoSimulatorPlugin
 
 QT += core interfaceframework
 
-QFACE_FORMAT = backend_simulator
-QFACE_SOURCES = ../../org.example.echo.qface
+IFCODEGEN_TEMPLATE = backend_simulator
+IFCODEGEN_SOURCES = ../../org.example.echo.qface
 
 SOURCES += backend_simulator.cpp
diff --git a/tests/auto/core/ifcodegen/org-example-echo/frontend/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo/frontend/CMakeLists.txt
index a7dea8d6..9e7340ab 100644
--- a/tests/auto/core/ifcodegen/org-example-echo/frontend/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo/frontend/CMakeLists.txt
@@ -10,8 +10,8 @@ set_target_properties(echo_frontend PROPERTIES RUNTIME_OUTPUT_DIRECTORY ../)
 
 # Interface Framework Generator:
 qt6_ifcodegen(echo_frontend
-    QFACE_SOURCES ../../org.example.echo.qface
-    QFACE_FORMAT frontend
+    IFCODEGEN_SOURCES ../../org.example.echo.qface
+    IFCODEGEN_TEMPLATE frontend
 )
 target_include_directories(echo_frontend PUBLIC
     ${CMAKE_CURRENT_BINARY_DIR}
diff --git a/tests/auto/core/ifcodegen/org-example-echo/frontend/frontend.pro b/tests/auto/core/ifcodegen/org-example-echo/frontend/frontend.pro
index a56860c0..1be4030a 100644
--- a/tests/auto/core/ifcodegen/org-example-echo/frontend/frontend.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo/frontend/frontend.pro
@@ -10,5 +10,5 @@ DEFINES += QT_BUILD_ORG_EXAMPLE_ECHO_LIB
 
 macos: QMAKE_SONAME_PREFIX = @rpath
 
-QFACE_SOURCES = ../../org.example.echo.qface
+IFCODEGEN_SOURCES = ../../org.example.echo.qface
 
diff --git a/tests/auto/core/ifcodegen/org-example-echo/qmlplugin/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo/qmlplugin/CMakeLists.txt
index faa9c9c8..f1866bf8 100644
--- a/tests/auto/core/ifcodegen/org-example-echo/qmlplugin/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo/qmlplugin/CMakeLists.txt
@@ -7,8 +7,8 @@ set(CMAKE_AUTOUIC ON)
 
 # Interface Framework Generator:
 qt6_ifcodegen(echo_frontend_qmlplugin # special case
-    QFACE_SOURCES ../../org.example.echo.qface
-    QFACE_FORMAT qmlplugin
+    IFCODEGEN_SOURCES ../../org.example.echo.qface
+    IFCODEGEN_TEMPLATE qmlplugin
 )
 
 target_link_libraries(echo_frontend_qmlplugin PRIVATE # special case
diff --git a/tests/auto/core/ifcodegen/org-example-echo/qmlplugin/qmlplugin.pro b/tests/auto/core/ifcodegen/org-example-echo/qmlplugin/qmlplugin.pro
index 80475700..13762aab 100644
--- a/tests/auto/core/ifcodegen/org-example-echo/qmlplugin/qmlplugin.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo/qmlplugin/qmlplugin.pro
@@ -5,7 +5,7 @@ CONFIG += c++11 plugin
 INCLUDEPATH += $$OUT_PWD/../frontend
 LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_frontend)
 
-QFACE_FORMAT = qmlplugin
-QFACE_SOURCES = ../../org.example.echo.qface
+IFCODEGEN_TEMPLATE = qmlplugin
+IFCODEGEN_SOURCES = ../../org.example.echo.qface
 
 load(ifcodegen)
diff --git a/tests/auto/core/ifcodegen/org-example-echo/test/CMakeLists.txt b/tests/auto/core/ifcodegen/org-example-echo/test/CMakeLists.txt
index a261bd7c..ab73aa11 100644
--- a/tests/auto/core/ifcodegen/org-example-echo/test/CMakeLists.txt
+++ b/tests/auto/core/ifcodegen/org-example-echo/test/CMakeLists.txt
@@ -19,6 +19,6 @@ set_target_properties(tst_org-example-echo PROPERTIES RUNTIME_OUTPUT_DIRECTORY .
 
 # Interface Framework Generator:
 qt6_ifcodegen(tst_org-example-echo
-    QFACE_SOURCES ../../org.example.echo.qface
-    QFACE_FORMAT test
+    IFCODEGEN_SOURCES ../../org.example.echo.qface
+    IFCODEGEN_TEMPLATE test
 )
diff --git a/tests/auto/core/ifcodegen/org-example-echo/test/test.pro b/tests/auto/core/ifcodegen/org-example-echo/test/test.pro
index 0cad9bd9..73cf768b 100644
--- a/tests/auto/core/ifcodegen/org-example-echo/test/test.pro
+++ b/tests/auto/core/ifcodegen/org-example-echo/test/test.pro
@@ -10,5 +10,5 @@ LIBS += -L$$OUT_PWD/.. -l$$qtLibraryTarget(echo_frontend)
 
 QMAKE_RPATHDIR += $$OUT_PWD/..
 
-QFACE_FORMAT = test
-QFACE_SOURCES = ../../org.example.echo.qface
+IFCODEGEN_TEMPLATE = test
+IFCODEGEN_SOURCES = ../../org.example.echo.qface
diff --git a/tests/auto/vehiclefunctions/basic/CMakeLists.txt b/tests/auto/vehiclefunctions/basic/CMakeLists.txt
index c174a536..52d1eab5 100644
--- a/tests/auto/vehiclefunctions/basic/CMakeLists.txt
+++ b/tests/auto/vehiclefunctions/basic/CMakeLists.txt
@@ -16,8 +16,8 @@ qt_internal_add_test(tst_vehiclefunctions_basic
 
 # Interface Framework Generator:
 qt_ifcodegen(tst_vehiclefunctions_basic
-    QFACE_SOURCES ../../../../src/ifvehiclefunctions/ifvehiclefunctions.qface
-    QFACE_FORMAT test
+    IFCODEGEN_SOURCES ../../../../src/ifvehiclefunctions/ifvehiclefunctions.qface
+    IFCODEGEN_TEMPLATE test
 )
 
 #### Keys ignored in scope 1:.:.:basic.pro:<TRUE>: