diff --git a/bindings/go/keystone/samples/main.go b/bindings/go/keystone/samples/main.go
index 567fd14670dea22dd4a555af70386d69e3fcc319..6ab3014291a9245c7f588040034200595a675d7a 100644
--- a/bindings/go/keystone/samples/main.go
+++ b/bindings/go/keystone/samples/main.go
@@ -14,19 +14,19 @@ import (
 func main() {
 	assembly := os.Args[1]
 
-	if ks, err := keystone.New(keystone.ArchitectureX86, keystone.Mode32); err != nil {
+	ks, err := keystone.New(keystone.ARCH_X86, keystone.MODE_32)
+	if err != nil {
 		panic(err)
-	} else {
-		defer ks.Close()
+	}
+	defer ks.Close()
 
-		if err := ks.Option(keystone.OptionSyntax, keystone.OptionSyntaxIntel); err != nil {
-			panic(fmt.Errorf("Could not set syntax option to intel"))
-		}
+	if err := ks.Option(keystone.OPT_SYNTAX, keystone.OPT_SYNTAX_INTEL); err != nil {
+		panic(fmt.Errorf("Could not set syntax option to intel"))
+	}
 
-		if insn, _, ok := ks.Assemble(assembly, 0); !ok {
-			panic(fmt.Errorf("Could not assemble instruction"))
-		} else {
-			fmt.Printf("%s: [%x]", assembly, insn)
-		}
+	if insn, _, ok := ks.Assemble(assembly, 0); !ok {
+		panic(fmt.Errorf("Could not assemble instruction"))
+	} else {
+		fmt.Printf("%s: [%x]", assembly, insn)
 	}
 }