diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
index 68a3efc46..c81dccc35 100644
--- a/.github/workflows/formatting.yml
+++ b/.github/workflows/formatting.yml
@@ -30,4 +30,4 @@ jobs:
           clang-format --version
           make format-check
       - name: LFC format check
-        run: cd lfc && ./gradlew spotlessCheck
+        run: cd lfuc && ./gradlew spotlessCheck
diff --git a/.gitignore b/.gitignore
index a6f61ddaf..787b98df2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ benchmarks/include
 cmake-build-debug
 cmake-build-release
 .idea
-!lfc/bin
+!lfuc/bin
 doc/html
 doc/latex
 doc/markdown/platform
diff --git a/Makefile b/Makefile
index d2e302d73..ad5610a45 100644
--- a/Makefile
+++ b/Makefile
@@ -46,12 +46,12 @@ HDR_FILES := $(shell find ./include -path ./include/reactor-uc/generated -prune
 
 format:
 	clang-format -i -style=file $(SRC_FILES) $(HDR_FILES)
-	cd lfc && ./gradlew ktfmtFormat && ./gradlew spotlessApply && cd ..
+	cd lfuc && ./gradlew ktfmtFormat && ./gradlew spotlessApply && cd ..
 
 # Check that the code base is formatted
 format-check:
 	clang-format --dry-run --Werror -style=file $(SRC_FILES) $(HDR_FILES)
-	cd lfc && ./gradlew ktfmtCheck && ./gradlew spotlessCheck && cd ..
+	cd lfuc && ./gradlew ktfmtCheck && ./gradlew spotlessCheck && cd ..
 
 # Run the entire CI flow
 ci: clean format-check test coverage
diff --git a/README.md b/README.md
index 944575f04..b7c67c59f 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ main reactor {
   =}
 }
 EOF
-./lfc/bin/lfc-dev HelloWorld.lf
+./lfuc/bin/lfuc-dev HelloWorld.lf
 bin/HelloWorld
 ```
 
@@ -92,7 +92,7 @@ make
 ### Code organization
 The project is organized as follows:
 - `./src` and `./include`: The runtime.
-- `./lfc`: A minimal copy of the Lingua Franca Compiler including a new code-generator
+- `./lfuc`: A minimal copy of the Lingua Franca Compiler including a new code-generator
 - `./examples`: Example programs for the different target platforms
 - `./external`: External dependencies, such as nanopb
 - `./test`: Unit, platform and integration tests
diff --git a/benchmarks/runAll.sh b/benchmarks/runAll.sh
index 63ca1b1a8..fa45012fd 100755
--- a/benchmarks/runAll.sh
+++ b/benchmarks/runAll.sh
@@ -2,7 +2,7 @@
 set -e
 
 LFC=lfc
-LFCG=${REACTOR_UC_PATH}/lfc/bin/lfc-dev
+LFCG=${REACTOR_UC_PATH}/lfuc/bin/lfuc-dev
 
 $LFC src/PingPongC.lf
 $LFCG src/PingPongUc.lf
diff --git a/cmake/lfc.cmake b/cmake/lfuc.cmake
similarity index 96%
rename from cmake/lfc.cmake
rename to cmake/lfuc.cmake
index 3b736d51d..99237f115 100644
--- a/cmake/lfc.cmake
+++ b/cmake/lfuc.cmake
@@ -30,7 +30,7 @@ function(lf_run_lfc LF_SOURCE_DIR LF_MAIN)
     message(FATAL_ERROR "LF main file does not exist: ${LF_SOURCE_DIR}/${LF_MAIN}.lf")
   endif()  
 
-  set(LFC_COMMAND $ENV{REACTOR_UC_PATH}/lfc/bin/lfc-dev ${LF_SOURCE_DIR}/${LF_MAIN}.lf -n -o ${CMAKE_CURRENT_SOURCE_DIR})
+  set(LFC_COMMAND $ENV{REACTOR_UC_PATH}/lfuc/bin/lfuc-dev ${LF_SOURCE_DIR}/${LF_MAIN}.lf -n -o ${CMAKE_CURRENT_SOURCE_DIR})
   execute_process(COMMAND echo "Running LFC: ${LFC_COMMAND}")
   execute_process(
       COMMAND ${LFC_COMMAND}
diff --git a/doc/markdown/2_introduction.md b/doc/markdown/2_introduction.md
index aefc4d2c3..538145904 100644
--- a/doc/markdown/2_introduction.md
+++ b/doc/markdown/2_introduction.md
@@ -30,7 +30,7 @@ targeting the Native platform.
     =}
   }
   EOF
-  reactor-uc/lfc/bin/lfc-dev HelloWorld.lf
+  reactor-uc/lfuc/bin/lfuc-dev HelloWorld.lf
   bin/HelloWorld
 \endcode
 
diff --git a/doc/markdown/3_philosophy.md b/doc/markdown/3_philosophy.md
index 6c8e7ef68..9ca358c4a 100644
--- a/doc/markdown/3_philosophy.md
+++ b/doc/markdown/3_philosophy.md
@@ -10,19 +10,19 @@ beginners.
 
 The design of systems with reactor-uc and LF follows a top-down design
 approach, where the programmer starts with his design written in LF. The LF
-compiler (`lfc`) translates your design into C code. This generated code uses the
+compiler (`lfuc`) translates your design into C code. This generated code uses the
 reactor-uc runtime functions to execute the program. When you create federated
-(distributed) programs, `lfc` generates subfolders for each federate (node) in your
+(distributed) programs, `lfuc` generates subfolders for each federate (node) in your
 system. The goal of reactor-uc is to enable integration into existing toolchains. 
-For example, for projects based on Zephyr, we provide `lfc`-integration through
+For example, for projects based on Zephyr, we provide `lfuc`-integration through
 a custom `west` command. When building an application the programmer interacts
-with `west` as usual, and `west` calls `lfc` to generate C code from the LF source
+with `west` as usual, and `west` calls `lfuc` to generate C code from the LF source
 files, finally `west` uses CMake to configure and build the final executable.
 Another example is RIOT OS, which has a Make-based toolchain. For RIOT we
-integrate `lfc` into the application Makefile such that calling `make all`
-first invokes `lfc` on the LF sources before compiling the generated sources.
+integrate `lfuc` into the application Makefile such that calling `make all`
+first invokes `lfuc` on the LF sources before compiling the generated sources.
 
-`lfc` produces importable CMake and make files that you can import into your
+`lfuc` produces importable CMake and make files that you can import into your
 build-system. For common platforms like [Zephyr](https://zephyrproject.org/),
 [RIOT](https://riot-os.org) or the
 [pico-sdk](https://www.raspberrypi.com/documentation/pico-sdk/) we provide
diff --git a/env.bash b/env.bash
index b4433e6fd..da62a2449 100644
--- a/env.bash
+++ b/env.bash
@@ -3,5 +3,5 @@
 
 curdir=$(pwd)
 export REACTOR_UC_PATH=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-alias lfcg='${REACTOR_UC_PATH}/lfc/bin/lfc-dev'
+alias lfuc='${REACTOR_UC_PATH}/lfuc/bin/lfuc-dev'
 cd $curdir
\ No newline at end of file
diff --git a/env.fish b/env.fish
index d7e46e3b8..ce43eebc2 100644
--- a/env.fish
+++ b/env.fish
@@ -5,10 +5,10 @@ cd $curdir
 
 # Define the function
 function do_lfc
-    {$REACTOR_UC_PATH}/lfc/bin/lfc-dev $argv
+    {$REACTOR_UC_PATH}/lfuc/bin/lfuc-dev $argv
 end
 
 # Create an alias for the function
-function lfcg
+function lfuc
     do_lfc $argv
 end
diff --git a/env.zsh b/env.zsh
index c664dc928..1115268c3 100644
--- a/env.zsh
+++ b/env.zsh
@@ -4,4 +4,4 @@
 script_dir=$(dirname "$0:A")
 
 export REACTOR_UC_PATH=$script_dir
-alias lfcg='${REACTOR_UC_PATH}/lfc/bin/lfc-dev'
\ No newline at end of file
+alias lfuc='${REACTOR_UC_PATH}/lfuc/bin/lfuc-dev'
\ No newline at end of file
diff --git a/examples/fed-template/buildAll.sh b/examples/fed-template/buildAll.sh
index bfe78ea93..c9d89f8db 100755
--- a/examples/fed-template/buildAll.sh
+++ b/examples/fed-template/buildAll.sh
@@ -1,17 +1,17 @@
 #!/usr/bin/env bash
 set -e
 
-${REACTOR_UC_PATH}/lfc/bin/lfc-dev --gen-fed-templates src/MyFed.lf
+${REACTOR_UC_PATH}/lfuc/bin/lfuc-dev --gen-fed-templates src/MyFed.lf
 
 
 pushd MyFed/src
-./run_lfc.sh
+./run_lfuc.sh
 cmake -Bbuild
 cmake --build build
 popd
 
 pushd MyFed/dest
-./run_lfc.sh
+./run_lfuc.sh
 west build
 popd
 
diff --git a/examples/flexpret/buildAll.sh b/examples/flexpret/buildAll.sh
index 44f6f6dd6..92bf2b444 100755
--- a/examples/flexpret/buildAll.sh
+++ b/examples/flexpret/buildAll.sh
@@ -1,5 +1,5 @@
 # set -e
-# ${REACTOR_UC_PATH}/lfc/bin/lfc-dev src/Smoke.lf
+# ${REACTOR_UC_PATH}/lfuc/bin/lfuc-dev src/Smoke.lf
 # cmake -Bbuild
 # make -C build
 # bin/fp-smoke
\ No newline at end of file
diff --git a/examples/riot/coap_federated_lf/CoapFederatedLF/r1/run_lfc.sh b/examples/riot/coap_federated_lf/CoapFederatedLF/r1/run_lfc.sh
index 2ab0edc4a..400b02a5c 100755
--- a/examples/riot/coap_federated_lf/CoapFederatedLF/r1/run_lfc.sh
+++ b/examples/riot/coap_federated_lf/CoapFederatedLF/r1/run_lfc.sh
@@ -2,4 +2,4 @@
 
 LF_MAIN=CoapFederatedLF
 
-$REACTOR_UC_PATH/lfc/bin/lfc-dev ../../src/$LF_MAIN.lf -n -o .
\ No newline at end of file
+$REACTOR_UC_PATH/lfuc/bin/lfuc-dev ../../src/$LF_MAIN.lf -n -o .
\ No newline at end of file
diff --git a/examples/riot/coap_federated_lf/CoapFederatedLF/r2/run_lfc.sh b/examples/riot/coap_federated_lf/CoapFederatedLF/r2/run_lfc.sh
index 2ab0edc4a..400b02a5c 100755
--- a/examples/riot/coap_federated_lf/CoapFederatedLF/r2/run_lfc.sh
+++ b/examples/riot/coap_federated_lf/CoapFederatedLF/r2/run_lfc.sh
@@ -2,4 +2,4 @@
 
 LF_MAIN=CoapFederatedLF
 
-$REACTOR_UC_PATH/lfc/bin/lfc-dev ../../src/$LF_MAIN.lf -n -o .
\ No newline at end of file
+$REACTOR_UC_PATH/lfuc/bin/lfuc-dev ../../src/$LF_MAIN.lf -n -o .
\ No newline at end of file
diff --git a/examples/riot/coap_federated_lf/build.sh b/examples/riot/coap_federated_lf/build.sh
index e33a1c5b6..6f8324d10 100755
--- a/examples/riot/coap_federated_lf/build.sh
+++ b/examples/riot/coap_federated_lf/build.sh
@@ -2,16 +2,16 @@
 LF_MAIN=CoapFederatedLF
 
 # Generate configuration templates if they don't exist already
-$REACTOR_UC_PATH/lfc/bin/lfc-dev --gen-fed-templates src/$LF_MAIN.lf
+$REACTOR_UC_PATH/lfuc/bin/lfuc-dev --gen-fed-templates src/$LF_MAIN.lf
 
 # Generate and build r1 sources
 pushd ./$LF_MAIN/r1
-    ./run_lfc.sh
+    ./run_lfuc.sh
     PORT=tap0 make all
 popd
 
 # Generate and build r2 sources
 pushd ./$LF_MAIN/r2
-    ./run_lfc.sh
+    ./run_lfuc.sh
     PORT=tap1 make all
 popd
diff --git a/examples/riot/hello_lf/Makefile b/examples/riot/hello_lf/Makefile
index 9a6de6071..024adcc86 100755
--- a/examples/riot/hello_lf/Makefile
+++ b/examples/riot/hello_lf/Makefile
@@ -9,7 +9,7 @@ LF_MAIN ?= HelloLF
 
 # Execute the LF compiler if build target is "all"
 ifeq ($(firstword $(MAKECMDGOALS)),all)
-  _ :=  $(shell $(REACTOR_UC_PATH)/lfc/bin/lfc-dev src/$(LF_MAIN).lf)
+  _ :=  $(shell $(REACTOR_UC_PATH)/lfuc/bin/lfuc-dev src/$(LF_MAIN).lf)
 endif
 
 # ---- RIOT specific configuration ----
diff --git a/examples/zephyr/hello_lf/README.md b/examples/zephyr/hello_lf/README.md
index 9ce67dfd2..8daf8c1fd 100644
--- a/examples/zephyr/hello_lf/README.md
+++ b/examples/zephyr/hello_lf/README.md
@@ -1,7 +1,7 @@
 # Simple example of using the reactor-uc with LF and Zephyr
 
 ```
-lfc src/HelloLF.lf -c
+lfuc src/HelloLF.lf -c
 west build -b qemu_cortex_m3
 west build -t run
 ```
\ No newline at end of file
diff --git a/examples/zephyr/hello_lf/run/build.sh b/examples/zephyr/hello_lf/run/build.sh
index 6dd50c87b..442f980f6 100755
--- a/examples/zephyr/hello_lf/run/build.sh
+++ b/examples/zephyr/hello_lf/run/build.sh
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-${REACTOR_UC_PATH}/lfc/bin/lfc-dev src/HelloLF.lf
+${REACTOR_UC_PATH}/lfuc/bin/lfuc-dev src/HelloLF.lf
 west build -b qemu_cortex_m3 -p always
\ No newline at end of file
diff --git a/lfc/gradle/wrapper/gradle-wrapper.jar b/lfc/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 7f93135c4..000000000
Binary files a/lfc/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/lfc/settings.gradle b/lfc/settings.gradle
deleted file mode 100644
index 0c3a9abe2..000000000
--- a/lfc/settings.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-rootProject.name = 'org.lflang'
-include('core', 'cli:base', 'cli:lfc')
diff --git a/lfc/.gitignore b/lfuc/.gitignore
similarity index 100%
rename from lfc/.gitignore
rename to lfuc/.gitignore
diff --git a/lfc/README.md b/lfuc/README.md
similarity index 100%
rename from lfc/README.md
rename to lfuc/README.md
diff --git a/lfc/bin/lfc-dev b/lfuc/bin/lfuc-dev
similarity index 94%
rename from lfc/bin/lfc-dev
rename to lfuc/bin/lfuc-dev
index 266424894..6944f17f5 100755
--- a/lfc/bin/lfc-dev
+++ b/lfuc/bin/lfuc-dev
@@ -55,5 +55,5 @@ fi
 gradlew="${base}/gradlew"
 
 # Launch the tool.
-"${gradlew}" --quiet -p "${base}" assemble ":cli:lfc:assemble"
-"${base}/build/install/lf-cli/bin/lfc" "$@"
+"${gradlew}" --quiet -p "${base}" assemble ":cli:lfuc:assemble"
+"${base}/build/install/lf-cli/bin/lfuc" "$@"
diff --git a/lfc/bin/lfc-dev.ps1 b/lfuc/bin/lfuc-dev.ps1
similarity index 79%
rename from lfc/bin/lfc-dev.ps1
rename to lfuc/bin/lfuc-dev.ps1
index 33e278437..7b0c6a9af 100644
--- a/lfc/bin/lfc-dev.ps1
+++ b/lfuc/bin/lfuc-dev.ps1
@@ -11,5 +11,5 @@ $base="$PSScriptRoot\..\"
 $gradlew="${base}/gradlew.bat"
 
 # invoke script
-& "${gradlew}" --quiet -p "${base}" assemble ":cli:lfc:assemble"
-& "${base}/build/install/lf-cli/bin/lfc" @args
\ No newline at end of file
+& "${gradlew}" --quiet -p "${base}" assemble ":cli:lfuc:assemble"
+& "${base}/build/install/lf-cli/bin/lfuc" @args
\ No newline at end of file
diff --git a/lfc/build.gradle b/lfuc/build.gradle
similarity index 91%
rename from lfc/build.gradle
rename to lfuc/build.gradle
index a91b78619..273f4af03 100644
--- a/lfc/build.gradle
+++ b/lfuc/build.gradle
@@ -32,7 +32,7 @@ distributions {
             distributionClassifier = platform.os + '-' + platform.arch
         }
         contents {
-          from tasks.getByPath('cli:lfc:installDist').outputs
+          from tasks.getByPath('cli:lfuc:installDist').outputs
           duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         }
     }
@@ -47,6 +47,6 @@ assemble.dependsOn('installDist')
 
 
 // Alias tasks for simpler access
-tasks.register('runLfc', JavaExec) {
-    dependsOn('cli:lfc:run')
+tasks.register('runLfuc', JavaExec) {
+    dependsOn('cli:lfuc:run')
 }
diff --git a/lfc/buildSrc/build.gradle b/lfuc/buildSrc/build.gradle
similarity index 100%
rename from lfc/buildSrc/build.gradle
rename to lfuc/buildSrc/build.gradle
diff --git a/lfc/buildSrc/gradle.properties b/lfuc/buildSrc/gradle.properties
similarity index 100%
rename from lfc/buildSrc/gradle.properties
rename to lfuc/buildSrc/gradle.properties
diff --git a/lfc/buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle b/lfuc/buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle
similarity index 100%
rename from lfc/buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle
rename to lfuc/buildSrc/src/main/groovy/org.lflang.antlr-conventions.gradle
diff --git a/lfc/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle b/lfuc/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle
similarity index 100%
rename from lfc/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle
rename to lfuc/buildSrc/src/main/groovy/org.lflang.distribution-conventions.gradle
diff --git a/lfc/buildSrc/src/main/groovy/org.lflang.java-application-conventions.gradle b/lfuc/buildSrc/src/main/groovy/org.lflang.java-application-conventions.gradle
similarity index 100%
rename from lfc/buildSrc/src/main/groovy/org.lflang.java-application-conventions.gradle
rename to lfuc/buildSrc/src/main/groovy/org.lflang.java-application-conventions.gradle
diff --git a/lfc/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle b/lfuc/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
similarity index 100%
rename from lfc/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
rename to lfuc/buildSrc/src/main/groovy/org.lflang.java-conventions.gradle
diff --git a/lfc/buildSrc/src/main/groovy/org.lflang.java-library-conventions.gradle b/lfuc/buildSrc/src/main/groovy/org.lflang.java-library-conventions.gradle
similarity index 100%
rename from lfc/buildSrc/src/main/groovy/org.lflang.java-library-conventions.gradle
rename to lfuc/buildSrc/src/main/groovy/org.lflang.java-library-conventions.gradle
diff --git a/lfc/buildSrc/src/main/groovy/org.lflang.kotlin-conventions.gradle b/lfuc/buildSrc/src/main/groovy/org.lflang.kotlin-conventions.gradle
similarity index 100%
rename from lfc/buildSrc/src/main/groovy/org.lflang.kotlin-conventions.gradle
rename to lfuc/buildSrc/src/main/groovy/org.lflang.kotlin-conventions.gradle
diff --git a/lfc/buildSrc/src/main/groovy/org.lflang.platform.gradle b/lfuc/buildSrc/src/main/groovy/org.lflang.platform.gradle
similarity index 100%
rename from lfc/buildSrc/src/main/groovy/org.lflang.platform.gradle
rename to lfuc/buildSrc/src/main/groovy/org.lflang.platform.gradle
diff --git a/lfc/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle b/lfuc/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle
similarity index 100%
rename from lfc/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle
rename to lfuc/buildSrc/src/main/groovy/org.lflang.test-conventions.gradle
diff --git a/lfc/cli/base/build.gradle b/lfuc/cli/base/build.gradle
similarity index 100%
rename from lfc/cli/base/build.gradle
rename to lfuc/cli/base/build.gradle
diff --git a/lfc/cli/base/src/main/java/org/lflang/cli/CliBase.java b/lfuc/cli/base/src/main/java/org/lflang/cli/CliBase.java
similarity index 100%
rename from lfc/cli/base/src/main/java/org/lflang/cli/CliBase.java
rename to lfuc/cli/base/src/main/java/org/lflang/cli/CliBase.java
diff --git a/lfc/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java b/lfuc/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java
similarity index 100%
rename from lfc/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java
rename to lfuc/cli/base/src/main/java/org/lflang/cli/LFStandaloneModule.java
diff --git a/lfc/cli/base/src/main/java/org/lflang/cli/StandaloneIssueAcceptor.java b/lfuc/cli/base/src/main/java/org/lflang/cli/StandaloneIssueAcceptor.java
similarity index 100%
rename from lfc/cli/base/src/main/java/org/lflang/cli/StandaloneIssueAcceptor.java
rename to lfuc/cli/base/src/main/java/org/lflang/cli/StandaloneIssueAcceptor.java
diff --git a/lfc/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java b/lfuc/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
similarity index 100%
rename from lfc/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
rename to lfuc/cli/base/src/main/java/org/lflang/cli/StandaloneMessageReporter.java
diff --git a/lfc/cli/base/src/main/java/org/lflang/cli/VersionProvider.java b/lfuc/cli/base/src/main/java/org/lflang/cli/VersionProvider.java
similarity index 100%
rename from lfc/cli/base/src/main/java/org/lflang/cli/VersionProvider.java
rename to lfuc/cli/base/src/main/java/org/lflang/cli/VersionProvider.java
diff --git a/lfc/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt b/lfuc/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt
similarity index 100%
rename from lfc/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt
rename to lfuc/cli/base/src/main/kotlin/org/lflang/cli/ReportingUtil.kt
diff --git a/lfc/cli/lfc/build.gradle b/lfuc/cli/lfuc/build.gradle
similarity index 88%
rename from lfc/cli/lfc/build.gradle
rename to lfuc/cli/lfuc/build.gradle
index 4d2f42358..449f645cd 100644
--- a/lfc/cli/lfc/build.gradle
+++ b/lfuc/cli/lfuc/build.gradle
@@ -10,6 +10,6 @@ dependencies {
 }
 
 application {
-    mainClass = 'org.lflang.cli.Lfc'
+    mainClass = 'org.lflang.cli.Lfuc'
     tasks.run.workingDir = System.getProperty("user.dir")
 }
diff --git a/lfc/cli/lfc/src/main/java/org/lflang/cli/Lfc.java b/lfuc/cli/lfuc/src/main/java/org/lflang/cli/Lfuc.java
similarity index 99%
rename from lfc/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
rename to lfuc/cli/lfuc/src/main/java/org/lflang/cli/Lfuc.java
index 37d66b40f..3858c37c1 100644
--- a/lfc/cli/lfc/src/main/java/org/lflang/cli/Lfc.java
+++ b/lfuc/cli/lfuc/src/main/java/org/lflang/cli/Lfuc.java
@@ -35,11 +35,11 @@
  * @author Atharva Patil
  */
 @Command(
-    name = "lfc",
+    name = "lfuc",
     // Enable usageHelp (--help) and versionHelp (--version) options.
     mixinStandardHelpOptions = true,
     versionProvider = VersionProvider.class)
-public class Lfc extends CliBase {
+public class Lfuc extends CliBase {
   /** Injected code generator. */
   @Inject private GeneratorDelegate generator;
 
@@ -187,7 +187,7 @@ public static void main(final String[] args) {
    * @param args Command-line arguments.
    */
   public static void main(Io io, final String... args) {
-    cliMain("lfc", Lfc.class, io, args);
+    cliMain("lfuc", Lfuc.class, io, args);
   }
 
   /** Load the resource, validate it, and, invoke the code generator. */
diff --git a/lfc/config/spotbugs/exclude.xml b/lfuc/config/spotbugs/exclude.xml
similarity index 100%
rename from lfc/config/spotbugs/exclude.xml
rename to lfuc/config/spotbugs/exclude.xml
diff --git a/lfc/core/build.gradle b/lfuc/core/build.gradle
similarity index 100%
rename from lfc/core/build.gradle
rename to lfuc/core/build.gradle
diff --git a/lfc/core/src/main/antlr/C.g4 b/lfuc/core/src/main/antlr/C.g4
similarity index 100%
rename from lfc/core/src/main/antlr/C.g4
rename to lfuc/core/src/main/antlr/C.g4
diff --git a/lfc/core/src/main/antlr/MTLLexer.g4 b/lfuc/core/src/main/antlr/MTLLexer.g4
similarity index 100%
rename from lfc/core/src/main/antlr/MTLLexer.g4
rename to lfuc/core/src/main/antlr/MTLLexer.g4
diff --git a/lfc/core/src/main/antlr/MTLParser.g4 b/lfuc/core/src/main/antlr/MTLParser.g4
similarity index 100%
rename from lfc/core/src/main/antlr/MTLParser.g4
rename to lfuc/core/src/main/antlr/MTLParser.g4
diff --git a/lfc/core/src/main/java/org/lflang/AttributeUtils.java b/lfuc/core/src/main/java/org/lflang/AttributeUtils.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/AttributeUtils.java
rename to lfuc/core/src/main/java/org/lflang/AttributeUtils.java
diff --git a/lfc/core/src/main/java/org/lflang/DefaultMessageReporter.java b/lfuc/core/src/main/java/org/lflang/DefaultMessageReporter.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/DefaultMessageReporter.java
rename to lfuc/core/src/main/java/org/lflang/DefaultMessageReporter.java
diff --git a/lfc/core/src/main/java/org/lflang/FileConfig.java b/lfuc/core/src/main/java/org/lflang/FileConfig.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/FileConfig.java
rename to lfuc/core/src/main/java/org/lflang/FileConfig.java
diff --git a/lfc/core/src/main/java/org/lflang/GenerateLinguaFranca.mwe2 b/lfuc/core/src/main/java/org/lflang/GenerateLinguaFranca.mwe2
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/GenerateLinguaFranca.mwe2
rename to lfuc/core/src/main/java/org/lflang/GenerateLinguaFranca.mwe2
diff --git a/lfc/core/src/main/java/org/lflang/InferredType.java b/lfuc/core/src/main/java/org/lflang/InferredType.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/InferredType.java
rename to lfuc/core/src/main/java/org/lflang/InferredType.java
diff --git a/lfc/core/src/main/java/org/lflang/LFResourceDescriptionStrategy.java b/lfuc/core/src/main/java/org/lflang/LFResourceDescriptionStrategy.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/LFResourceDescriptionStrategy.java
rename to lfuc/core/src/main/java/org/lflang/LFResourceDescriptionStrategy.java
diff --git a/lfc/core/src/main/java/org/lflang/LFResourceProvider.java b/lfuc/core/src/main/java/org/lflang/LFResourceProvider.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/LFResourceProvider.java
rename to lfuc/core/src/main/java/org/lflang/LFResourceProvider.java
diff --git a/lfc/core/src/main/java/org/lflang/LFRuntimeModule.java b/lfuc/core/src/main/java/org/lflang/LFRuntimeModule.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/LFRuntimeModule.java
rename to lfuc/core/src/main/java/org/lflang/LFRuntimeModule.java
diff --git a/lfc/core/src/main/java/org/lflang/LFStandaloneSetup.java b/lfuc/core/src/main/java/org/lflang/LFStandaloneSetup.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/LFStandaloneSetup.java
rename to lfuc/core/src/main/java/org/lflang/LFStandaloneSetup.java
diff --git a/lfc/core/src/main/java/org/lflang/LFSyntaxErrorMessageProvider.java b/lfuc/core/src/main/java/org/lflang/LFSyntaxErrorMessageProvider.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/LFSyntaxErrorMessageProvider.java
rename to lfuc/core/src/main/java/org/lflang/LFSyntaxErrorMessageProvider.java
diff --git a/lfc/core/src/main/java/org/lflang/LinguaFranca.xtext b/lfuc/core/src/main/java/org/lflang/LinguaFranca.xtext
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/LinguaFranca.xtext
rename to lfuc/core/src/main/java/org/lflang/LinguaFranca.xtext
diff --git a/lfc/core/src/main/java/org/lflang/LocalStrings.java b/lfuc/core/src/main/java/org/lflang/LocalStrings.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/LocalStrings.java
rename to lfuc/core/src/main/java/org/lflang/LocalStrings.java
diff --git a/lfc/core/src/main/java/org/lflang/MainConflictChecker.java b/lfuc/core/src/main/java/org/lflang/MainConflictChecker.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/MainConflictChecker.java
rename to lfuc/core/src/main/java/org/lflang/MainConflictChecker.java
diff --git a/lfc/core/src/main/java/org/lflang/MessageReporter.java b/lfuc/core/src/main/java/org/lflang/MessageReporter.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/MessageReporter.java
rename to lfuc/core/src/main/java/org/lflang/MessageReporter.java
diff --git a/lfc/core/src/main/java/org/lflang/MessageReporterBase.java b/lfuc/core/src/main/java/org/lflang/MessageReporterBase.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/MessageReporterBase.java
rename to lfuc/core/src/main/java/org/lflang/MessageReporterBase.java
diff --git a/lfc/core/src/main/java/org/lflang/ModelInfo.java b/lfuc/core/src/main/java/org/lflang/ModelInfo.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/ModelInfo.java
rename to lfuc/core/src/main/java/org/lflang/ModelInfo.java
diff --git a/lfc/core/src/main/java/org/lflang/TimeUnit.java b/lfuc/core/src/main/java/org/lflang/TimeUnit.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/TimeUnit.java
rename to lfuc/core/src/main/java/org/lflang/TimeUnit.java
diff --git a/lfc/core/src/main/java/org/lflang/TimeValue.java b/lfuc/core/src/main/java/org/lflang/TimeValue.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/TimeValue.java
rename to lfuc/core/src/main/java/org/lflang/TimeValue.java
diff --git a/lfc/core/src/main/java/org/lflang/ast/ASTUtils.java b/lfuc/core/src/main/java/org/lflang/ast/ASTUtils.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/ast/ASTUtils.java
rename to lfuc/core/src/main/java/org/lflang/ast/ASTUtils.java
diff --git a/lfc/core/src/main/java/org/lflang/ast/AstTransformation.java b/lfuc/core/src/main/java/org/lflang/ast/AstTransformation.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/ast/AstTransformation.java
rename to lfuc/core/src/main/java/org/lflang/ast/AstTransformation.java
diff --git a/lfc/core/src/main/java/org/lflang/ast/FormattingUtil.java b/lfuc/core/src/main/java/org/lflang/ast/FormattingUtil.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/ast/FormattingUtil.java
rename to lfuc/core/src/main/java/org/lflang/ast/FormattingUtil.java
diff --git a/lfc/core/src/main/java/org/lflang/ast/IsEqual.java b/lfuc/core/src/main/java/org/lflang/ast/IsEqual.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/ast/IsEqual.java
rename to lfuc/core/src/main/java/org/lflang/ast/IsEqual.java
diff --git a/lfc/core/src/main/java/org/lflang/ast/LfParsingHelper.java b/lfuc/core/src/main/java/org/lflang/ast/LfParsingHelper.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/ast/LfParsingHelper.java
rename to lfuc/core/src/main/java/org/lflang/ast/LfParsingHelper.java
diff --git a/lfc/core/src/main/java/org/lflang/ast/MalleableString.java b/lfuc/core/src/main/java/org/lflang/ast/MalleableString.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/ast/MalleableString.java
rename to lfuc/core/src/main/java/org/lflang/ast/MalleableString.java
diff --git a/lfc/core/src/main/java/org/lflang/ast/ToLf.java b/lfuc/core/src/main/java/org/lflang/ast/ToLf.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/ast/ToLf.java
rename to lfuc/core/src/main/java/org/lflang/ast/ToLf.java
diff --git a/lfc/core/src/main/java/org/lflang/ast/ToSExpr.java b/lfuc/core/src/main/java/org/lflang/ast/ToSExpr.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/ast/ToSExpr.java
rename to lfuc/core/src/main/java/org/lflang/ast/ToSExpr.java
diff --git a/lfc/core/src/main/java/org/lflang/ast/ToText.java b/lfuc/core/src/main/java/org/lflang/ast/ToText.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/ast/ToText.java
rename to lfuc/core/src/main/java/org/lflang/ast/ToText.java
diff --git a/lfc/core/src/main/java/org/lflang/formatting2/LFFormatter.java b/lfuc/core/src/main/java/org/lflang/formatting2/LFFormatter.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/formatting2/LFFormatter.java
rename to lfuc/core/src/main/java/org/lflang/formatting2/LFFormatter.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/Argument.java b/lfuc/core/src/main/java/org/lflang/generator/Argument.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/Argument.java
rename to lfuc/core/src/main/java/org/lflang/generator/Argument.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/CodeMap.java b/lfuc/core/src/main/java/org/lflang/generator/CodeMap.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/CodeMap.java
rename to lfuc/core/src/main/java/org/lflang/generator/CodeMap.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/DiagnosticReporting.java b/lfuc/core/src/main/java/org/lflang/generator/DiagnosticReporting.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/DiagnosticReporting.java
rename to lfuc/core/src/main/java/org/lflang/generator/DiagnosticReporting.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/GenerationException.java b/lfuc/core/src/main/java/org/lflang/generator/GenerationException.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/GenerationException.java
rename to lfuc/core/src/main/java/org/lflang/generator/GenerationException.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/GeneratorArguments.java b/lfuc/core/src/main/java/org/lflang/generator/GeneratorArguments.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/GeneratorArguments.java
rename to lfuc/core/src/main/java/org/lflang/generator/GeneratorArguments.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/GeneratorBase.java b/lfuc/core/src/main/java/org/lflang/generator/GeneratorBase.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/GeneratorBase.java
rename to lfuc/core/src/main/java/org/lflang/generator/GeneratorBase.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java b/lfuc/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
rename to lfuc/core/src/main/java/org/lflang/generator/GeneratorCommandFactory.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/GeneratorResult.java b/lfuc/core/src/main/java/org/lflang/generator/GeneratorResult.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/GeneratorResult.java
rename to lfuc/core/src/main/java/org/lflang/generator/GeneratorResult.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/GeneratorUtils.java b/lfuc/core/src/main/java/org/lflang/generator/GeneratorUtils.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/GeneratorUtils.java
rename to lfuc/core/src/main/java/org/lflang/generator/GeneratorUtils.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java b/lfuc/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
rename to lfuc/core/src/main/java/org/lflang/generator/HumanReadableReportingStrategy.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/IntegratedBuilder.java b/lfuc/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
rename to lfuc/core/src/main/java/org/lflang/generator/IntegratedBuilder.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/InvalidLfSourceException.java b/lfuc/core/src/main/java/org/lflang/generator/InvalidLfSourceException.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/InvalidLfSourceException.java
rename to lfuc/core/src/main/java/org/lflang/generator/InvalidLfSourceException.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/InvalidSourceException.java b/lfuc/core/src/main/java/org/lflang/generator/InvalidSourceException.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/InvalidSourceException.java
rename to lfuc/core/src/main/java/org/lflang/generator/InvalidSourceException.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/LFGenerator.java b/lfuc/core/src/main/java/org/lflang/generator/LFGenerator.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/LFGenerator.java
rename to lfuc/core/src/main/java/org/lflang/generator/LFGenerator.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/LFGeneratorContext.java b/lfuc/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
rename to lfuc/core/src/main/java/org/lflang/generator/LFGeneratorContext.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java b/lfuc/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
rename to lfuc/core/src/main/java/org/lflang/generator/LanguageServerMessageReporter.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/LfExpressionVisitor.java b/lfuc/core/src/main/java/org/lflang/generator/LfExpressionVisitor.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/LfExpressionVisitor.java
rename to lfuc/core/src/main/java/org/lflang/generator/LfExpressionVisitor.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/MainContext.java b/lfuc/core/src/main/java/org/lflang/generator/MainContext.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/MainContext.java
rename to lfuc/core/src/main/java/org/lflang/generator/MainContext.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/Position.java b/lfuc/core/src/main/java/org/lflang/generator/Position.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/Position.java
rename to lfuc/core/src/main/java/org/lflang/generator/Position.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/Range.java b/lfuc/core/src/main/java/org/lflang/generator/Range.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/Range.java
rename to lfuc/core/src/main/java/org/lflang/generator/Range.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/SubContext.java b/lfuc/core/src/main/java/org/lflang/generator/SubContext.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/SubContext.java
rename to lfuc/core/src/main/java/org/lflang/generator/SubContext.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/TargetTypes.java b/lfuc/core/src/main/java/org/lflang/generator/TargetTypes.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/TargetTypes.java
rename to lfuc/core/src/main/java/org/lflang/generator/TargetTypes.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/UnsupportedGeneratorFeatureException.java b/lfuc/core/src/main/java/org/lflang/generator/UnsupportedGeneratorFeatureException.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/UnsupportedGeneratorFeatureException.java
rename to lfuc/core/src/main/java/org/lflang/generator/UnsupportedGeneratorFeatureException.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/ValidationStrategy.java b/lfuc/core/src/main/java/org/lflang/generator/ValidationStrategy.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/ValidationStrategy.java
rename to lfuc/core/src/main/java/org/lflang/generator/ValidationStrategy.java
diff --git a/lfc/core/src/main/java/org/lflang/generator/Validator.java b/lfuc/core/src/main/java/org/lflang/generator/Validator.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/generator/Validator.java
rename to lfuc/core/src/main/java/org/lflang/generator/Validator.java
diff --git a/lfc/core/src/main/java/org/lflang/graph/DirectedGraph.java b/lfuc/core/src/main/java/org/lflang/graph/DirectedGraph.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/graph/DirectedGraph.java
rename to lfuc/core/src/main/java/org/lflang/graph/DirectedGraph.java
diff --git a/lfc/core/src/main/java/org/lflang/graph/Graph.java b/lfuc/core/src/main/java/org/lflang/graph/Graph.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/graph/Graph.java
rename to lfuc/core/src/main/java/org/lflang/graph/Graph.java
diff --git a/lfc/core/src/main/java/org/lflang/graph/InstantiationGraph.java b/lfuc/core/src/main/java/org/lflang/graph/InstantiationGraph.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/graph/InstantiationGraph.java
rename to lfuc/core/src/main/java/org/lflang/graph/InstantiationGraph.java
diff --git a/lfc/core/src/main/java/org/lflang/graph/NodeAnnotation.java b/lfuc/core/src/main/java/org/lflang/graph/NodeAnnotation.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/graph/NodeAnnotation.java
rename to lfuc/core/src/main/java/org/lflang/graph/NodeAnnotation.java
diff --git a/lfc/core/src/main/java/org/lflang/graph/NodeAnnotations.java b/lfuc/core/src/main/java/org/lflang/graph/NodeAnnotations.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/graph/NodeAnnotations.java
rename to lfuc/core/src/main/java/org/lflang/graph/NodeAnnotations.java
diff --git a/lfc/core/src/main/java/org/lflang/graph/PrecedenceGraph.java b/lfuc/core/src/main/java/org/lflang/graph/PrecedenceGraph.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/graph/PrecedenceGraph.java
rename to lfuc/core/src/main/java/org/lflang/graph/PrecedenceGraph.java
diff --git a/lfc/core/src/main/java/org/lflang/ide/LFIdeModule.java b/lfuc/core/src/main/java/org/lflang/ide/LFIdeModule.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/ide/LFIdeModule.java
rename to lfuc/core/src/main/java/org/lflang/ide/LFIdeModule.java
diff --git a/lfc/core/src/main/java/org/lflang/ide/LFIdeSetup.java b/lfuc/core/src/main/java/org/lflang/ide/LFIdeSetup.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/ide/LFIdeSetup.java
rename to lfuc/core/src/main/java/org/lflang/ide/LFIdeSetup.java
diff --git a/lfc/core/src/main/java/org/lflang/scoping/LFGlobalScopeProvider.java b/lfuc/core/src/main/java/org/lflang/scoping/LFGlobalScopeProvider.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/scoping/LFGlobalScopeProvider.java
rename to lfuc/core/src/main/java/org/lflang/scoping/LFGlobalScopeProvider.java
diff --git a/lfc/core/src/main/java/org/lflang/scoping/LFScopeProvider.java b/lfuc/core/src/main/java/org/lflang/scoping/LFScopeProvider.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/scoping/LFScopeProvider.java
rename to lfuc/core/src/main/java/org/lflang/scoping/LFScopeProvider.java
diff --git a/lfc/core/src/main/java/org/lflang/scoping/LFScopeProviderImpl.java b/lfuc/core/src/main/java/org/lflang/scoping/LFScopeProviderImpl.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/scoping/LFScopeProviderImpl.java
rename to lfuc/core/src/main/java/org/lflang/scoping/LFScopeProviderImpl.java
diff --git a/lfc/core/src/main/java/org/lflang/target/Target.java b/lfuc/core/src/main/java/org/lflang/target/Target.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/Target.java
rename to lfuc/core/src/main/java/org/lflang/target/Target.java
diff --git a/lfc/core/src/main/java/org/lflang/target/TargetConfig.java b/lfuc/core/src/main/java/org/lflang/target/TargetConfig.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/TargetConfig.java
rename to lfuc/core/src/main/java/org/lflang/target/TargetConfig.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/BooleanProperty.java b/lfuc/core/src/main/java/org/lflang/target/property/BooleanProperty.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/BooleanProperty.java
rename to lfuc/core/src/main/java/org/lflang/target/property/BooleanProperty.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java b/lfuc/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
rename to lfuc/core/src/main/java/org/lflang/target/property/BuildTypeProperty.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java b/lfuc/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
rename to lfuc/core/src/main/java/org/lflang/target/property/ClockSyncModeProperty.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java b/lfuc/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
rename to lfuc/core/src/main/java/org/lflang/target/property/CmakeIncludeProperty.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/FastProperty.java b/lfuc/core/src/main/java/org/lflang/target/property/FastProperty.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/FastProperty.java
rename to lfuc/core/src/main/java/org/lflang/target/property/FastProperty.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/FileListProperty.java b/lfuc/core/src/main/java/org/lflang/target/property/FileListProperty.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/FileListProperty.java
rename to lfuc/core/src/main/java/org/lflang/target/property/FileListProperty.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/FilesProperty.java b/lfuc/core/src/main/java/org/lflang/target/property/FilesProperty.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/FilesProperty.java
rename to lfuc/core/src/main/java/org/lflang/target/property/FilesProperty.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java b/lfuc/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
rename to lfuc/core/src/main/java/org/lflang/target/property/KeepaliveProperty.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/LoggingProperty.java b/lfuc/core/src/main/java/org/lflang/target/property/LoggingProperty.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/LoggingProperty.java
rename to lfuc/core/src/main/java/org/lflang/target/property/LoggingProperty.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/NoCompileProperty.java b/lfuc/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
rename to lfuc/core/src/main/java/org/lflang/target/property/NoCompileProperty.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/lfuc/core/src/main/java/org/lflang/target/property/PlatformProperty.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/PlatformProperty.java
rename to lfuc/core/src/main/java/org/lflang/target/property/PlatformProperty.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/TargetProperty.java b/lfuc/core/src/main/java/org/lflang/target/property/TargetProperty.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/TargetProperty.java
rename to lfuc/core/src/main/java/org/lflang/target/property/TargetProperty.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/TimeOutProperty.java b/lfuc/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
rename to lfuc/core/src/main/java/org/lflang/target/property/TimeOutProperty.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/type/ArrayType.java b/lfuc/core/src/main/java/org/lflang/target/property/type/ArrayType.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/type/ArrayType.java
rename to lfuc/core/src/main/java/org/lflang/target/property/type/ArrayType.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/type/BuildTypeType.java b/lfuc/core/src/main/java/org/lflang/target/property/type/BuildTypeType.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/type/BuildTypeType.java
rename to lfuc/core/src/main/java/org/lflang/target/property/type/BuildTypeType.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/type/ClockSyncModeType.java b/lfuc/core/src/main/java/org/lflang/target/property/type/ClockSyncModeType.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/type/ClockSyncModeType.java
rename to lfuc/core/src/main/java/org/lflang/target/property/type/ClockSyncModeType.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/type/CoordinationModeType.java b/lfuc/core/src/main/java/org/lflang/target/property/type/CoordinationModeType.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/type/CoordinationModeType.java
rename to lfuc/core/src/main/java/org/lflang/target/property/type/CoordinationModeType.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/type/DictionaryType.java b/lfuc/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
rename to lfuc/core/src/main/java/org/lflang/target/property/type/DictionaryType.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/type/LoggingType.java b/lfuc/core/src/main/java/org/lflang/target/property/type/LoggingType.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/type/LoggingType.java
rename to lfuc/core/src/main/java/org/lflang/target/property/type/LoggingType.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/type/OptionsType.java b/lfuc/core/src/main/java/org/lflang/target/property/type/OptionsType.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/type/OptionsType.java
rename to lfuc/core/src/main/java/org/lflang/target/property/type/OptionsType.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/type/PlatformType.java b/lfuc/core/src/main/java/org/lflang/target/property/type/PlatformType.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/type/PlatformType.java
rename to lfuc/core/src/main/java/org/lflang/target/property/type/PlatformType.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java b/lfuc/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java
rename to lfuc/core/src/main/java/org/lflang/target/property/type/PrimitiveType.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/type/SchedulerType.java b/lfuc/core/src/main/java/org/lflang/target/property/type/SchedulerType.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/type/SchedulerType.java
rename to lfuc/core/src/main/java/org/lflang/target/property/type/SchedulerType.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java b/lfuc/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
rename to lfuc/core/src/main/java/org/lflang/target/property/type/StringDictionaryType.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java b/lfuc/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java
rename to lfuc/core/src/main/java/org/lflang/target/property/type/TargetPropertyType.java
diff --git a/lfc/core/src/main/java/org/lflang/target/property/type/UnionType.java b/lfuc/core/src/main/java/org/lflang/target/property/type/UnionType.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/target/property/type/UnionType.java
rename to lfuc/core/src/main/java/org/lflang/target/property/type/UnionType.java
diff --git a/lfc/core/src/main/java/org/lflang/util/Averager.java b/lfuc/core/src/main/java/org/lflang/util/Averager.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/util/Averager.java
rename to lfuc/core/src/main/java/org/lflang/util/Averager.java
diff --git a/lfc/core/src/main/java/org/lflang/util/CollectionUtil.java b/lfuc/core/src/main/java/org/lflang/util/CollectionUtil.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/util/CollectionUtil.java
rename to lfuc/core/src/main/java/org/lflang/util/CollectionUtil.java
diff --git a/lfc/core/src/main/java/org/lflang/util/FileUtil.java b/lfuc/core/src/main/java/org/lflang/util/FileUtil.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/util/FileUtil.java
rename to lfuc/core/src/main/java/org/lflang/util/FileUtil.java
diff --git a/lfc/core/src/main/java/org/lflang/util/IteratorUtil.java b/lfuc/core/src/main/java/org/lflang/util/IteratorUtil.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/util/IteratorUtil.java
rename to lfuc/core/src/main/java/org/lflang/util/IteratorUtil.java
diff --git a/lfc/core/src/main/java/org/lflang/util/LFCommand.java b/lfuc/core/src/main/java/org/lflang/util/LFCommand.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/util/LFCommand.java
rename to lfuc/core/src/main/java/org/lflang/util/LFCommand.java
diff --git a/lfc/core/src/main/java/org/lflang/util/Pair.java b/lfuc/core/src/main/java/org/lflang/util/Pair.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/util/Pair.java
rename to lfuc/core/src/main/java/org/lflang/util/Pair.java
diff --git a/lfc/core/src/main/java/org/lflang/util/StringUtil.java b/lfuc/core/src/main/java/org/lflang/util/StringUtil.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/util/StringUtil.java
rename to lfuc/core/src/main/java/org/lflang/util/StringUtil.java
diff --git a/lfc/core/src/main/java/org/lflang/util/TargetResourceNotFoundException.java b/lfuc/core/src/main/java/org/lflang/util/TargetResourceNotFoundException.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/util/TargetResourceNotFoundException.java
rename to lfuc/core/src/main/java/org/lflang/util/TargetResourceNotFoundException.java
diff --git a/lfc/core/src/main/java/org/lflang/validation/AttributeSpec.java b/lfuc/core/src/main/java/org/lflang/validation/AttributeSpec.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/validation/AttributeSpec.java
rename to lfuc/core/src/main/java/org/lflang/validation/AttributeSpec.java
diff --git a/lfc/core/src/main/java/org/lflang/validation/BaseLFValidator.java b/lfuc/core/src/main/java/org/lflang/validation/BaseLFValidator.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/validation/BaseLFValidator.java
rename to lfuc/core/src/main/java/org/lflang/validation/BaseLFValidator.java
diff --git a/lfc/core/src/main/java/org/lflang/validation/LFNamesAreUniqueValidationHelper.java b/lfuc/core/src/main/java/org/lflang/validation/LFNamesAreUniqueValidationHelper.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/validation/LFNamesAreUniqueValidationHelper.java
rename to lfuc/core/src/main/java/org/lflang/validation/LFNamesAreUniqueValidationHelper.java
diff --git a/lfc/core/src/main/java/org/lflang/validation/LFValidator.java b/lfuc/core/src/main/java/org/lflang/validation/LFValidator.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/validation/LFValidator.java
rename to lfuc/core/src/main/java/org/lflang/validation/LFValidator.java
diff --git a/lfc/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java b/lfuc/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
similarity index 100%
rename from lfc/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
rename to lfuc/core/src/main/java/org/lflang/validation/ValidatorMessageReporter.java
diff --git a/lfc/core/src/main/kotlin/org/lflang/CommonExtensions.kt b/lfuc/core/src/main/kotlin/org/lflang/CommonExtensions.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/CommonExtensions.kt
rename to lfuc/core/src/main/kotlin/org/lflang/CommonExtensions.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/FileConfigExtensions.kt b/lfuc/core/src/main/kotlin/org/lflang/FileConfigExtensions.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/FileConfigExtensions.kt
rename to lfuc/core/src/main/kotlin/org/lflang/FileConfigExtensions.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/ast/AstExtensions.kt b/lfuc/core/src/main/kotlin/org/lflang/ast/AstExtensions.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/ast/AstExtensions.kt
rename to lfuc/core/src/main/kotlin/org/lflang/ast/AstExtensions.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/GeneratorExtensions.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/GeneratorExtensions.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/GeneratorExtensions.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/GeneratorExtensions.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/GeneratorUtils.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/GeneratorUtils.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/GeneratorUtils.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/GeneratorUtils.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/LanguageRuntimeVersions.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/LanguageRuntimeVersions.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/LanguageRuntimeVersions.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/LanguageRuntimeVersions.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcActionGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcActionGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcActionGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcActionGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcClockSyncGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcClockSyncGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcClockSyncGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcClockSyncGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcCmakeGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcCmakeGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcCmakeGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcCmakeGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcConnectionGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcConnectionGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcConnectionGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcConnectionGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcConnectionUtils.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcConnectionUtils.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcConnectionUtils.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcConnectionUtils.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcExtensions.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcExtensions.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcExtensions.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcExtensions.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederate.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcFederate.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederate.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcFederate.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederateGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcFederateGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederateGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcFederateGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederatedLaunchScriptGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcFederatedLaunchScriptGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederatedLaunchScriptGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcFederatedLaunchScriptGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederatedProjectTemplateGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcFederatedProjectTemplateGenerator.kt
similarity index 95%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederatedProjectTemplateGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcFederatedProjectTemplateGenerator.kt
index 96fec14d7..9b0b70ce8 100644
--- a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederatedProjectTemplateGenerator.kt
+++ b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcFederatedProjectTemplateGenerator.kt
@@ -30,10 +30,10 @@ class UcFederatedTemplateGenerator(
             |
             |LF_MAIN=${mainDef.name}
             |
-            |${S}REACTOR_UC_PATH/lfc/bin/lfc-dev ../../src/${S}LF_MAIN.lf -n -o .
+            |${S}REACTOR_UC_PATH/lfuc/bin/lfuc-dev ../../src/${S}LF_MAIN.lf -n -o .
         """
             .trimMargin()
-    val filePath = projectRoot.resolve("run_lfc.sh")
+    val filePath = projectRoot.resolve("run_lfuc.sh")
     FileUtil.writeToFile(shellScript, filePath)
     filePath.setPosixFilePermissions(
         setOf(
@@ -54,7 +54,7 @@ class UcFederatedTemplateGenerator(
             |project(${mainDef.name}_${targetName})
             |
             |${if (createMainTarget) "add_executable($S{LF_MAIN_TARGET})" else ""}
-            |include(${S}ENV{REACTOR_UC_PATH}/cmake/lfc.cmake)
+            |include(${S}ENV{REACTOR_UC_PATH}/cmake/lfuc.cmake)
             |lf_setup()
             |lf_build_generated_code($S{LF_MAIN_TARGET} $S{CMAKE_CURRENT_SOURCE_DIR}/src-gen/$S{LF_MAIN}/$S{FEDERATE})
             |
@@ -119,7 +119,7 @@ class UcFederatedTemplateGenerator(
             |# Change this to 0 show compiler invocation lines by default:
             |QUIET ?= 1
             |
-            |include $S(REACTOR_UC_PATH)/make/riot/riot-lfc.mk
+            |include $S(REACTOR_UC_PATH)/make/riot/riot-lfuc.mk
         """
             .trimMargin()
     FileUtil.writeToFile(make, projectRoot.resolve("Makefile"))
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFileConfig.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcFileConfig.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFileConfig.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcFileConfig.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcGeneratorFederated.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcGeneratorFederated.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcGeneratorFederated.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcGeneratorFederated.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcGeneratorNonFederated.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcGeneratorNonFederated.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcGeneratorNonFederated.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcGeneratorNonFederated.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcInstanceGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcInstanceGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcInstanceGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcInstanceGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcIpAddress.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcIpAddress.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcIpAddress.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcIpAddress.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMainGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcMainGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMainGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcMainGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcMakeGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcNetworkChannel.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcNetworkChannel.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcNetworkChannel.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcNetworkChannel.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcParameterGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcParameterGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcParameterGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcParameterGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcPlatformGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcPlatformGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcPlatformGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcPlatformGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcPlatformGeneratorFederated.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcPlatformGeneratorFederated.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcPlatformGeneratorFederated.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcPlatformGeneratorFederated.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcPlatformGeneratorNonFederated.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcPlatformGeneratorNonFederated.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcPlatformGeneratorNonFederated.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcPlatformGeneratorNonFederated.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcPortGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcPortGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcPortGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcPortGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcPreambleGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcPreambleGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcPreambleGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcPreambleGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcReactionGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcReactionGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcReactionGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcReactionGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcReactorGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcReactorGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcReactorGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcReactorGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcStartupCoordinatorGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcStartupCoordinatorGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcStartupCoordinatorGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcStartupCoordinatorGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcStateGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcStateGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcStateGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcStateGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcTimerGenerator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcTimerGenerator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcTimerGenerator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcTimerGenerator.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcTypes.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcTypes.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcTypes.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcTypes.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcUARTDevices.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcUARTDevices.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcUARTDevices.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcUARTDevices.kt
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcValidator.kt b/lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcValidator.kt
similarity index 100%
rename from lfc/core/src/main/kotlin/org/lflang/generator/uc/UcValidator.kt
rename to lfuc/core/src/main/kotlin/org/lflang/generator/uc/UcValidator.kt
diff --git a/lfc/core/src/main/resources/META-INF/services/de.cau.cs.kieler.klighd.IKlighdStartupHook b/lfuc/core/src/main/resources/META-INF/services/de.cau.cs.kieler.klighd.IKlighdStartupHook
similarity index 100%
rename from lfc/core/src/main/resources/META-INF/services/de.cau.cs.kieler.klighd.IKlighdStartupHook
rename to lfuc/core/src/main/resources/META-INF/services/de.cau.cs.kieler.klighd.IKlighdStartupHook
diff --git a/lfc/core/src/main/resources/org/lflang/StringsBundle.properties b/lfuc/core/src/main/resources/org/lflang/StringsBundle.properties
similarity index 100%
rename from lfc/core/src/main/resources/org/lflang/StringsBundle.properties
rename to lfuc/core/src/main/resources/org/lflang/StringsBundle.properties
diff --git a/lfc/gradle.properties b/lfuc/gradle.properties
similarity index 100%
rename from lfc/gradle.properties
rename to lfuc/gradle.properties
diff --git a/lfc/gradle/source-layout.gradle b/lfuc/gradle/source-layout.gradle
similarity index 100%
rename from lfc/gradle/source-layout.gradle
rename to lfuc/gradle/source-layout.gradle
diff --git a/lfc/gradle/wrapper/gradle-wrapper.properties b/lfuc/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from lfc/gradle/wrapper/gradle-wrapper.properties
rename to lfuc/gradle/wrapper/gradle-wrapper.properties
diff --git a/lfc/gradlew b/lfuc/gradlew
similarity index 100%
rename from lfc/gradlew
rename to lfuc/gradlew
diff --git a/lfc/gradlew.bat b/lfuc/gradlew.bat
similarity index 100%
rename from lfc/gradlew.bat
rename to lfuc/gradlew.bat
diff --git a/lfuc/settings.gradle b/lfuc/settings.gradle
new file mode 100644
index 000000000..0b2ff8385
--- /dev/null
+++ b/lfuc/settings.gradle
@@ -0,0 +1,2 @@
+rootProject.name = 'org.lflang'
+include('core', 'cli:base', 'cli:lfuc')
diff --git a/make/riot/riot-lfc.mk b/make/riot/riot-lfuc.mk
similarity index 100%
rename from make/riot/riot-lfc.mk
rename to make/riot/riot-lfuc.mk
diff --git a/test/lf/Makefile b/test/lf/Makefile
index 5772cf5c8..b0e33eee0 100644
--- a/test/lf/Makefile
+++ b/test/lf/Makefile
@@ -9,14 +9,14 @@ BINS_ONLY_BUILD = $(patsubst src/only_build/%.lf, bin/%, $(SRCS_ONLY_BUILD))
 SRCS_LEGACY = $(wildcard src/legacy/*.lf)
 BINS_LEGACY = $(patsubst src/legacy/%.lf, bin/%, $(SRCS_LEGACY))
 
-LFC_PATH=../../lfc
-LFC = ${LFC_PATH}/build/install/lf-cli/bin/lfc
+LFC_PATH=../../lfuc
+LFC = ${LFC_PATH}/build/install/lf-cli/bin/lfuc
 
 .PHONY: all clean legacy
 all: build_lfc ${BINS} legacy
 
 build_lfc:
-	${LFC_PATH}/bin/lfc-dev --version
+	${LFC_PATH}/bin/lfuc-dev --version
 
 bin/%: src/%.lf
 	${LFC} $^ -c