diff --git a/main.go b/main.go
index 77ed57c..e9af9d6 100644
--- a/main.go
+++ b/main.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"log"
 	"os"
-	certpair "pkcs-generator/modules/cert-pairs"
+	certpair "pkcs-generator/modules/certpairs"
 	"slices"
 
 	"fyne.io/fyne/v2"
@@ -26,8 +26,8 @@ var (
 )
 
 func main() {
-	a := app.NewWithID("nl.systemec.pkcs12-generator")
-	w := a.NewWindow("Systemec PKCS12-Generator")
+	a := app.NewWithID("nl.systemec.pkcs-generator")
+	w := a.NewWindow("Systemec PKCS-Generator")
 	w.Resize(windowSize)
 
 	var keyPath, certPath string
@@ -228,7 +228,7 @@ func parseX509(certData []byte) *x509.Certificate {
 	return cert
 }
 
-func integrityCheckAndGo(keyPath, certPath, caCertString, caRootString string) (string, []byte) {
+func integrityCheckAndGo(keyPath, certPath, caRootString, caCertString string) (string, []byte) {
 	if _, err := os.Stat(keyPath); err != nil {
 		fmt.Printf("Error checking Private Keyfile, %e", err)
 		return "Error...", nil