diff --git a/lib/libesp32/berry/gen.sh b/lib/libesp32/berry/gen.sh
index ee97feeef..5cb784e6b 100755
--- a/lib/libesp32/berry/gen.sh
+++ b/lib/libesp32/berry/gen.sh
@@ -5,4 +5,4 @@
 # Should be eventually included in the build process
 #
 rm generate/be_*.h
-python3 tools/pycoc/main.py -o generate src default ../berry_tasmota/src ../berry_mapping/src ../berry_int64/src ../../libesp32_lvgl/lv_binding_berry/src ../../libesp32_lvgl/lv_binding_berry/generate -c default/berry_conf.h
+python3 tools/coc/coc -o generate src default ../berry_tasmota/src ../berry_mapping/src ../berry_int64/src ../../libesp32_lvgl/lv_binding_berry/src ../../libesp32_lvgl/lv_binding_berry/generate -c default/berry_conf.h
diff --git a/lib/libesp32/berry/src/be_constobj.h b/lib/libesp32/berry/src/be_constobj.h
index b913b26dd..23b41bea6 100644
--- a/lib/libesp32/berry/src/be_constobj.h
+++ b/lib/libesp32/berry/src/be_constobj.h
@@ -45,7 +45,7 @@ extern "C" {
 }
 
 /* try to use the predefined string in strtab, but don't create an instance if none is present */
-/* the behavior is exactly the same as `be_const_key()` but it not detected by pycoc */
+/* the behavior is exactly the same as `be_const_key()` but it not detected by coc */
 #define be_const_key_weak(_str, _next) {                        \
     .v.c = &be_const_str_##_str,                                \
     .type = BE_STRING,                                          \
@@ -309,7 +309,7 @@ const bcstring be_const_str_##_name = {                         \
 }
 
 /* try to use the predefined string in strtab, but don't create an instance if none is present */
-/* the behavior is exactly the same as `be_const_key()` but it not detected by pycoc */
+/* the behavior is exactly the same as `be_const_key()` but it not detected by coc */
 #define be_const_key_weak(_str, _next) {                        \
     bvaldata(&be_const_str_##_str),                             \
         BE_STRING,                                              \
diff --git a/lib/libesp32/berry/tools/pycoc/block_builder.py b/lib/libesp32/berry/tools/coc/block_builder.py
similarity index 100%
rename from lib/libesp32/berry/tools/pycoc/block_builder.py
rename to lib/libesp32/berry/tools/coc/block_builder.py
diff --git a/lib/libesp32/berry/tools/pycoc/main.py b/lib/libesp32/berry/tools/coc/coc
similarity index 98%
rename from lib/libesp32/berry/tools/pycoc/main.py
rename to lib/libesp32/berry/tools/coc/coc
index 2c624d39a..2550e428e 100644
--- a/lib/libesp32/berry/tools/pycoc/main.py
+++ b/lib/libesp32/berry/tools/coc/coc
@@ -1,5 +1,4 @@
-# python3 main.py -o out in
-# coc 
+#! /usr/bin/env python3
 
 import re
 import os
diff --git a/lib/libesp32/berry/tools/pycoc/coc_parser.py b/lib/libesp32/berry/tools/coc/coc_parser.py
similarity index 100%
rename from lib/libesp32/berry/tools/pycoc/coc_parser.py
rename to lib/libesp32/berry/tools/coc/coc_parser.py
diff --git a/lib/libesp32/berry/tools/pycoc/coc_string.py b/lib/libesp32/berry/tools/coc/coc_string.py
similarity index 100%
rename from lib/libesp32/berry/tools/pycoc/coc_string.py
rename to lib/libesp32/berry/tools/coc/coc_string.py
diff --git a/lib/libesp32/berry/tools/pycoc/coc_string_test.py b/lib/libesp32/berry/tools/coc/coc_string_test.py
similarity index 100%
rename from lib/libesp32/berry/tools/pycoc/coc_string_test.py
rename to lib/libesp32/berry/tools/coc/coc_string_test.py
diff --git a/lib/libesp32/berry/tools/pycoc/hash_map.py b/lib/libesp32/berry/tools/coc/hash_map.py
similarity index 100%
rename from lib/libesp32/berry/tools/pycoc/hash_map.py
rename to lib/libesp32/berry/tools/coc/hash_map.py
diff --git a/lib/libesp32/berry/tools/pycoc/macro_table.py b/lib/libesp32/berry/tools/coc/macro_table.py
similarity index 100%
rename from lib/libesp32/berry/tools/pycoc/macro_table.py
rename to lib/libesp32/berry/tools/coc/macro_table.py
diff --git a/lib/libesp32/berry/tools/pycoc/str_build.py b/lib/libesp32/berry/tools/coc/str_build.py
similarity index 100%
rename from lib/libesp32/berry/tools/pycoc/str_build.py
rename to lib/libesp32/berry/tools/coc/str_build.py
diff --git a/lib/libesp32_lvgl/lv_binding_berry/README.md b/lib/libesp32_lvgl/lv_binding_berry/README.md
index 3e42b99ba..46c206bba 100644
--- a/lib/libesp32_lvgl/lv_binding_berry/README.md
+++ b/lib/libesp32_lvgl/lv_binding_berry/README.md
@@ -224,7 +224,7 @@ This phase is specific to Berry pre-compiled modules and classes.
 ```
 (berry)
 
-> python3 tools/pycoc/main.py -o generate src default ../berry_mapping/src ../lv_berry/src ../lv_berry/generate -c default/berry_conf.h
+> python3 tools/coc/coc -o generate src default ../berry_mapping/src ../lv_berry/src ../lv_berry/generate -c default/berry_conf.h
 (no output)
 ```