diff --git a/templates/dlang/types.py b/templates/dlang/types.py
index e26ddd6..cbfaa71 100644
--- a/templates/dlang/types.py
+++ b/templates/dlang/types.py
@@ -25,9 +25,9 @@
 
 enum VK_NULL_HANDLE = null;
 
-enum VK_DEFINE_HANDLE( string name ) = "struct " ~ name ~ "_handle; alias " ~ name ~ " = " ~ name ~ "_handle*;";
+enum VK_DEFINE_HANDLE( string name ) = "struct " ~ name ~ "_T; alias " ~ name ~ " = " ~ name ~ "_T*;";
 
-version( X86_64 ) {{
+version( D_LP64 ) {{
     alias VK_DEFINE_NON_DISPATCHABLE_HANDLE( string name ) = VK_DEFINE_HANDLE!name;
     enum VK_NULL_ND_HANDLE = null;
 }} else {{
@@ -65,4 +65,4 @@
 
 {TYPE_DEFINITIONS}\
 
-"""
\ No newline at end of file
+"""