diff --git a/etc/config/execution.defaults.properties b/etc/config/execution.defaults.properties
index c68c50862ec..b217899b65d 100644
--- a/etc/config/execution.defaults.properties
+++ b/etc/config/execution.defaults.properties
@@ -6,8 +6,8 @@ wineServer=
 winePrefix=/tmp/ce-wine-prefix
 firejail=firejail
 nsjail=nsjail
-nsjail.config.execute=etc/nsjail/execute.cfg
-nsjail.config.sandbox=etc/nsjail/sandbox.cfg
-firejail.profile.execute=etc/firejail/execute.profile
-firejail.profile.sandbox=etc/firejail/sandbox.profile
+nsjail.config.execute=etc/nsjail/compilers-and-tools.cfg
+nsjail.config.sandbox=etc/nsjail/user-execution.cfg
+firejail.profile.execute=etc/firejail/compilers-and-tools.profile
+firejail.profile.sandbox=etc/firejail/user-execution.profile
 firejail.profile.wine=etc/firejail/wine.profile
diff --git a/etc/firejail/execute.profile b/etc/firejail/compilers-and-tools.profile
similarity index 100%
rename from etc/firejail/execute.profile
rename to etc/firejail/compilers-and-tools.profile
diff --git a/etc/firejail/sandbox.profile b/etc/firejail/user-execution.profile
similarity index 100%
rename from etc/firejail/sandbox.profile
rename to etc/firejail/user-execution.profile
diff --git a/etc/nsjail/execute.cfg b/etc/nsjail/compilers-and-tools.cfg
similarity index 100%
rename from etc/nsjail/execute.cfg
rename to etc/nsjail/compilers-and-tools.cfg
diff --git a/etc/nsjail/sandbox.cfg b/etc/nsjail/user-execution.cfg
similarity index 100%
rename from etc/nsjail/sandbox.cfg
rename to etc/nsjail/user-execution.cfg