diff --git a/.github/workflows/ci-page-doc.yml b/.github/workflows/ci-page-doc.yml
index 43222dc..e8d3297 100644
--- a/.github/workflows/ci-page-doc.yml
+++ b/.github/workflows/ci-page-doc.yml
@@ -38,15 +38,15 @@ jobs:
       - name: V doctor
         run: v doctor
 
-      - name: Install WindowsReg
+      - name: Install winreg
         run: |
-          v install ldedev.windowsreg
+          v install ldedev.winreg
 
-      - name: Move windowsreg source code to path start
-        run: sudo mv ~/.vmodules/ldedev/windowsreg /windowsreg
+      - name: Move winreg source code to path start
+        run: sudo mv ~/.vmodules/ldedev/winreg /winreg
 
       - name: Construct doc
-        run: v doc -comments -readme -f html -m /windowsreg
+        run: v doc -comments -readme -f html -m /winreg
 
       - name: Setup Pages
         uses: actions/configure-pages@v3
@@ -55,7 +55,7 @@ jobs:
         uses: actions/upload-pages-artifact@v1
         with:
           # Upload entire repository
-          path: '/windowsreg/_docs'
+          path: '/winreg/_docs'
 
       - name: Deploy to GitHub Pages
         id: deployment
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 60cc0d5..9b71460 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,15 +30,15 @@ jobs:
       - name: V doctor
         run: v doctor
 
-      - name: Install windowsreg
+      - name: Install winreg
         run: |
-          v install ldedev.windowsreg
+          v install ldedev.winreg
 
-      - name: Move windowsreg source code to path start
-        run: mv ~/.vmodules/ldedev/windowsreg ~/windowsreg
+      - name: Move winreg source code to path start
+        run: mv ~/.vmodules/ldedev/winreg ~/winreg
 
       - name: Verify Fmt
-        run: v fmt -verify ~/windowsreg
+        run: v fmt -verify ~/winreg
 
   run-tests:
     runs-on: windows-latest
@@ -52,12 +52,12 @@ jobs:
       - name: V doctor
         run: v doctor
 
-      - name: Install windowsreg
+      - name: Install winreg
         run: |
-          v install ldedev.windowsreg
+          v install ldedev.winreg
 
-      - name: Move windowsreg source code to path start
-        run: mv $env:userprofile\.vmodules\ldedev\windowsreg $env:userprofile\desktop\windowsreg
+      - name: Move winreg source code to path start
+        run: mv $env:userprofile\.vmodules\ldedev\winreg $env:userprofile\desktop\winreg
 
       - name: Execute Tests using Pure V Backend
-        run: v -cc tcc -stats test $env:userprofile\desktop\windowsreg
+        run: v -cc tcc -stats test $env:userprofile\desktop\winreg
diff --git a/handle_key.v b/handle_key.v
index b0860fd..0766eda 100644
--- a/handle_key.v
+++ b/handle_key.v
@@ -2,8 +2,8 @@ module winreg
 
 @[noinit]
 pub struct HandleKey {
-	hkey     HKEYS
-	mode     AccessMode
+	hkey HKEYS
+	mode AccessMode
 pub:
 	subkey   string
 	hkey_ptr voidptr