diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e735b9..4d2d1e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,7 @@ if (ENABLE_CLANG_TIDY)
 endif()
 
 include(CodeGen)
-gen_coredsl(${CORE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/tgfs/gen_input/TGFS.core_desc interp)
+gen_coredsl(${CORE_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/tgfs/gen_input/${CORE_NAME}.core_desc interp)
 
 add_subdirectory(dbt-core)
 add_subdirectory(scc)
diff --git a/coredsl b/coredsl
index 62d95f8..4154939 160000
--- a/coredsl
+++ b/coredsl
@@ -1 +1 @@
-Subproject commit 62d95f8b3cb647d4ead94bfc4c79b48fe8cfdedd
+Subproject commit 41549393dfbd5079377fdc642e97cebbd502d632
diff --git a/tgfs b/tgfs
index 9c8b726..a308445 160000
--- a/tgfs
+++ b/tgfs
@@ -1 +1 @@
-Subproject commit 9c8b72693e1654ef016b57099f87b59b7b44e244
+Subproject commit a3084456fdf816db6234980024384e88f19b0466