diff --git a/src/CaosDB.jl b/src/CaosDB.jl
index e42d5046e510111abc8a0cc86c81933c92040c5d..b81fd4669dd3ea346f1819bf7bba98125ad3f03d 100644
--- a/src/CaosDB.jl
+++ b/src/CaosDB.jl
@@ -29,7 +29,7 @@ export evaluate_return_code,
     CaosDBException, ClientException, GenericCaosDBException, CaosDBMessage
 
 # Exports from module Utility
-export get_env_var
+export get_env_fallback
 
 # Export from module Connection
 export connect, connect_manually
diff --git a/src/Connection.jl b/src/Connection.jl
index ac29f69b45869c49e2c9baebad0572aa2e09cdc7..cf106ef79d2aec145345853098fcac36d66a5c16 100644
--- a/src/Connection.jl
+++ b/src/Connection.jl
@@ -364,13 +364,13 @@ function connect_manually(;
 
     if host == ""
 
-        host = CaosDB.Utility.get_env_var("CAOSDB_SERVER_HOST", "localhost")
+        host = CaosDB.Utility.get_env_fallback("CAOSDB_SERVER_HOST", "localhost")
 
     end
 
     if port_str == "undefined"
 
-        port_str = CaosDB.Utility.get_env_var("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443")
+        port_str = CaosDB.Utility.get_env_fallback("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443")
 
     end
 
@@ -378,19 +378,19 @@ function connect_manually(;
 
     if cacert == ""
 
-        cacert = CaosDB.Utility.get_env_var("CAOSDB_SERVER_CERT")
+        cacert = CaosDB.Utility.get_env_fallback("CAOSDB_SERVER_CERT")
 
     end
 
     if username == ""
 
-        username = CaosDB.Utility.get_env_var("CAOSDB_USER", "admin")
+        username = CaosDB.Utility.get_env_fallback("CAOSDB_USER", "admin")
 
     end
 
     if password == "undefined"
 
-        password = CaosDB.Utility.get_env_var("CAOSDB_PASSWORD", "caosdb")
+        password = CaosDB.Utility.get_env_fallback("CAOSDB_PASSWORD", "caosdb")
 
     end
 
diff --git a/src/Utility.jl b/src/Utility.jl
index 289d666fa1c81802aa8c45feedf94142b0a66c85..4f74dcdf06487fc7e5c4d1639294442fe1c02b1e 100644
--- a/src/Utility.jl
+++ b/src/Utility.jl
@@ -22,21 +22,21 @@
 #
 module Utility
 
-export get_env_var
+export get_env_fallback
 
 using ..CaosDB
 
 """
-    get_env_var(var[, default])
+    get_env_fallback(var[, default])
 
 Return the environmental variable `var` if it exists, `default`
 otherwise. If no `default` is given an empty string is returned
 instead.
 """
-function get_env_var(var::AbstractString, default::AbstractString = "")
+function get_env_fallback(var::AbstractString, default::AbstractString = "")
 
     ret = ccall(
-        (:caosdb_utility_get_env_var, CaosDB.library_name),
+        (:caosdb_utility_get_env_fallback, CaosDB.library_name),
         Cstring,
         (Cstring, Cstring),
         var,
diff --git a/test/runtests.jl b/test/runtests.jl
index ca2eedff8eed918349989b77f01f0f57501a0760..66b08bd87d55717710ead9fcf564f32a92abcdd7 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -30,7 +30,7 @@ using CaosDB
         else
             shell_var = "default"
         end
-        @test CaosDB.Utility.get_env_var("SHELL", "default") == shell_var
+        @test CaosDB.Utility.get_env_fallback("SHELL", "default") == shell_var
     end
 
     @testset "TestExceptions" begin