diff --git a/api_test.go b/api_test.go
index 578809b..7caddb5 100644
--- a/api_test.go
+++ b/api_test.go
@@ -83,7 +83,7 @@ func TestBuiltinSigners(t *testing.T) {
 	if err := signer.Sign(req, config); err != nil {
 		t.Fatal(err)
 	}
-	expected := "Basic " + encoding.Base64ToString([]byte("admin:123"))
+	expected := "Basic " + encoding.Base64([]byte("admin:123"))
 	if req.GetHeader("Authorization") != expected {
 		t.Errorf("expected %s, got %s", expected, req.GetHeader("Authorization"))
 	}
diff --git a/config.go b/config.go
index 2332c04..0c6dcf0 100644
--- a/config.go
+++ b/config.go
@@ -218,8 +218,8 @@ func decryptMapWithPrefix(m map[string]any) []*safe.SafeBuf {
 			raw := s[2:]
 			var b64 []byte
 			var err error
-			if b64, err = encoding.UnUrlBase64FromString(raw); err != nil {
-				b64, err = encoding.UnBase64FromString(raw)
+			if b64, err = encoding.UnURLBase64(raw); err != nil {
+				b64, err = encoding.UnBase64(raw)
 			}
 
 			if err == nil && len(b64) > 0 {
@@ -249,8 +249,8 @@ func decryptMap(m map[string]any) []*safe.SafeBuf {
 				inner = s[4 : len(s)-1]
 			}
 
-			if b64, err = encoding.UnUrlBase64FromString(inner); err != nil {
-				b64, err = encoding.UnBase64FromString(inner)
+			if b64, err = encoding.UnURLBase64(inner); err != nil {
+				b64, err = encoding.UnBase64(inner)
 			}
 
 			if err == nil && len(b64) > 0 {
diff --git a/security_test.go b/security_test.go
index 129a12e..ec4aa9c 100644
--- a/security_test.go
+++ b/security_test.go
@@ -15,7 +15,7 @@ func TestSafeConfigDecryption(t *testing.T) {
 
 	plaintext := "my-secret-password"
 	ciphertext, _ := confAES.EncryptBytes([]byte(plaintext))
-	b64 := encoding.Base64ToString(ciphertext)
+	b64 := encoding.Base64(ciphertext)
 
 	GlobalConfigs = map[string]any{
 		"api": map[string]any{
@@ -51,7 +51,7 @@ func TestSafeConfigDecryption(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	expectedAuth := "Basic " + encoding.Base64ToString([]byte("admin:"+plaintext))
+	expectedAuth := "Basic " + encoding.Base64([]byte("admin:"+plaintext))
 	if req.GetHeader("Authorization") != expectedAuth {
 		t.Errorf("expected %s, got %s", expectedAuth, req.GetHeader("Authorization"))
 	}