diff --git a/.gitignore b/.gitignore
index d3b7797..ac19049 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,4 @@ build32/
 build64/
 out/
 .cache/
-go4k/actual_output/
+actual_output/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b43618f..0913572 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,8 +18,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Switch to CMake for builds.
 - Compiling as a static library & an API to call Sointu
 - Running all tests (win/linux/mac) in the cloud, using Github workflows
-- go4k: a Go package to call Sointu
-- go4k: Importing and exporting Sointu .asm songs
-- go4k: asmfmt, a command line utility to format/process Sointu .asm song files
+- go: a Go package to call Sointu
+- go: Importing and exporting Sointu .asm songs
+- go: asmfmt, a command line utility to format/process Sointu .asm song files
 
 [Unreleased]: https://github.com/vsariola/sointu/compare/4klang-3.11...HEAD
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f67568e..ed36735 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
 
 # This policy is needed so that we can set the MSVC_RUNTIME to statically linked
 # i.e. set_property(TARGET 4klang PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-cmake_policy(SET CMP0091 NEW) 
+cmake_policy(SET CMP0091 NEW)
 
 project(sointu
     VERSION 0.0.0
@@ -42,7 +42,7 @@ endif()
 
 # the tests include the entire ASM but we still want to rebuild when they change
 file(GLOB templates ${PROJECT_SOURCE_DIR}/templates/*.asm)
-file(GLOB go4k "${PROJECT_SOURCE_DIR}/*.go" "${PROJECT_SOURCE_DIR}/cmd/sointu-cli/*.go")
+file(GLOB sointu "${PROJECT_SOURCE_DIR}/*.go" "${PROJECT_SOURCE_DIR}/cmd/sointu-cli/*.go")
 file(GLOB compilersrc "${PROJECT_SOURCE_DIR}/compiler/*.go")
 
 if(DEFINED CMAKE_C_SIZEOF_DATA_PTR AND CMAKE_C_SIZEOF_DATA_PTR EQUAL 8)
@@ -57,10 +57,10 @@ endif()
 set(STATICLIB sointu)
 set(sointuasm sointu.asm)
 
-add_custom_command(            
+add_custom_command(
     OUTPUT ${sointuasm}
     COMMAND go run ${PROJECT_SOURCE_DIR}/compiler/generate.go -arch=${arch} ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS "${templates}" "${go4k}" "${compilersrc}"
+    DEPENDS "${templates}" "${sointu}" "${compilersrc}"
 )
 
 add_library(${STATICLIB} ${sointuasm})