diff --git a/assemble/prepare/.calculate_directory b/assemble/prepare/.calculate_directory
index 527acc4..6660ad6 100644
--- a/assemble/prepare/.calculate_directory
+++ b/assemble/prepare/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip cl_assemble_prepare_action==up
+# Calculate append=skip ac_assemble_prepare==up
diff --git a/assemble/setup/.calculate_directory b/assemble/setup/.calculate_directory
index 4beb45c..9e61553 100644
--- a/assemble/setup/.calculate_directory
+++ b/assemble/setup/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip cl_assemble_setup_action==up
+# Calculate append=skip ac_assemble_setup==up
diff --git a/builder/clean/.calculate_directory b/builder/clean/.calculate_directory
index b114747..d7495ea 100644
--- a/builder/clean/.calculate_directory
+++ b/builder/clean/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip cl_builder_squash_action==up
+# Calculate append=skip ac_builder_squash==up
diff --git a/builder/iso/.calculate_directory b/builder/iso/.calculate_directory
index 14ff656..a061c13 100644
--- a/builder/iso/.calculate_directory
+++ b/builder/iso/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip cl_builder_iso_action==up
+# Calculate append=skip ac_builder_iso==up
diff --git a/builder/squash/.calculate_directory b/builder/squash/.calculate_directory
index b114747..d7495ea 100644
--- a/builder/squash/.calculate_directory
+++ b/builder/squash/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip cl_builder_squash_action==up
+# Calculate append=skip ac_builder_squash==up
diff --git a/client/domain/.calculate_directory b/client/domain/.calculate_directory
index 2b330bc..f75f8e8 100644
--- a/client/domain/.calculate_directory
+++ b/client/domain/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip cl_client_domain_action==up&&os_remote_auth!=
+# Calculate append=skip ac_client_domain==up&&os_remote_auth!=
diff --git a/client/undomain/.calculate_directory b/client/undomain/.calculate_directory
index b01be74..da626dd 100644
--- a/client/undomain/.calculate_directory
+++ b/client/undomain/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip cl_client_domain_action==down
+# Calculate append=skip ac_client_domain==down
diff --git a/desktop/00-desktop-init/.calculate_directory b/desktop/00-desktop-init/.calculate_directory
index c92d539..db88407 100644
--- a/desktop/00-desktop-init/.calculate_directory
+++ b/desktop/00-desktop-init/.calculate_directory
@@ -1 +1 @@
-# Calculate name= path=~ chmod=0700 chown=#-ur_login-#:#-ur_group-# cl_desktop_desktop_action==up&&load(~/.calculate/ini.env)==
+# Calculate name= path=~ chmod=0700 chown=#-ur_login-#:#-ur_group-# ac_desktop_desktop==up&&load(~/.calculate/ini.env)==
diff --git a/desktop/desktop/.calculate_directory b/desktop/desktop/.calculate_directory
index 2acc48a..e8aa3ec 100644
--- a/desktop/desktop/.calculate_directory
+++ b/desktop/desktop/.calculate_directory
@@ -1 +1 @@
-# Calculate path=~ name= chmod=0700 chown=#-ur_login-#:#-ur_group-# cl_desktop_desktop_action==up&&ini(main.update)!=off
+# Calculate path=~ name= chmod=0700 chown=#-ur_login-#:#-ur_group-# ac_desktop_desktop==up&&ini(main.update)!=off
diff --git a/desktop/install/.calculate_directory b/desktop/install/.calculate_directory
index 552605f..0636845 100644
--- a/desktop/install/.calculate_directory
+++ b/desktop/install/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip cl_desktop_install_action==up
+# Calculate append=skip ac_desktop_install==up
diff --git a/desktop/merge/.calculate_directory b/desktop/merge/.calculate_directory
index 8f2e744..32ea2e7 100644
--- a/desktop/merge/.calculate_directory
+++ b/desktop/merge/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip cl_desktop_merge_action==up
+# Calculate append=skip ac_desktop_merge==up
diff --git a/desktop/uninstall/.calculate_directory b/desktop/uninstall/.calculate_directory
index be6ffb3..5ee3ea2 100644
--- a/desktop/uninstall/.calculate_directory
+++ b/desktop/uninstall/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip cl_desktop_install_action==down
+# Calculate append=skip ac_desktop_install==down
diff --git a/install/0migrate/.calculate_directory b/install/0migrate/.calculate_directory
index 7572227..ec2fc4e 100644
--- a/install/0migrate/.calculate_directory
+++ b/install/0migrate/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip cl_install_system_action==up
+# Calculate append=skip ac_install_system==up
diff --git a/install/1merge/.calculate_directory b/install/1merge/.calculate_directory
index 0afd313..b730bc1 100644
--- a/install/1merge/.calculate_directory
+++ b/install/1merge/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip cl_install_merge_action==up
+# Calculate append=skip ac_install_merge==up
diff --git a/install/1merge/portage/make.conf b/install/1merge/portage/make.conf
index e72a86b..c8a7bd9 100644
--- a/install/1merge/portage/make.conf
+++ b/install/1merge/portage/make.conf
@@ -1,4 +1,4 @@
-# Calculate comment=# exists(/etc/make.conf,root)==&&cl_chroot_status==off||cl_install_system_action==up||os_install_root_type==livecd
+# Calculate comment=# exists(/etc/make.conf,root)==&&cl_chroot_status==off||ac_install_system==up||os_install_root_type==livecd
 
 #?os_install_locale_language!=ru&&?os_install_locale_language!=bg#
 #-------------------
diff --git a/install/1system/.calculate_directory b/install/1system/.calculate_directory
index 7572227..ec2fc4e 100644
--- a/install/1system/.calculate_directory
+++ b/install/1system/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip cl_install_system_action==up
+# Calculate append=skip ac_install_system==up
diff --git a/install/2laptop/.calculate_directory b/install/2laptop/.calculate_directory
index b04a232..135fd12 100644
--- a/install/2laptop/.calculate_directory
+++ b/install/2laptop/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip cl_install_merge_action==up hr_laptop!=
+# Calculate append=skip ac_install_merge==up hr_laptop!=
diff --git a/install/3flash/.calculate_directory b/install/3flash/.calculate_directory
index 9fb0919..7f5d998 100644
--- a/install/3flash/.calculate_directory
+++ b/install/3flash/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip pkg(sys-apps/calculate-install)>=2.2.1_rc12&&cl_install_flash_action==up
+# Calculate append=skip pkg(sys-apps/calculate-install)>=2.2.1_rc12&&ac_install_flash==up