diff --git a/crypto/armor/armor.go b/crypto/armor/armor.go
index 4146048ad..c15d070e6 100644
--- a/crypto/armor/armor.go
+++ b/crypto/armor/armor.go
@@ -1,4 +1,4 @@
-package crypto
+package armor
 
 import (
 	"bytes"
diff --git a/crypto/armor/armor_test.go b/crypto/armor/armor_test.go
index 5eae87c00..4aa23b211 100644
--- a/crypto/armor/armor_test.go
+++ b/crypto/armor/armor_test.go
@@ -1,4 +1,4 @@
-package crypto
+package armor
 
 import (
 	"testing"
diff --git a/crypto/encoding/amino/amino.go b/crypto/encoding/amino/amino.go
index f87d89882..e3945cb52 100644
--- a/crypto/encoding/amino/amino.go
+++ b/crypto/encoding/amino/amino.go
@@ -1,4 +1,4 @@
-package crypto
+package cryptoAmino
 
 import (
 	amino "github.com/tendermint/go-amino"
diff --git a/crypto/encoding/amino/encode_test.go b/crypto/encoding/amino/encode_test.go
index 74812aa62..e01206089 100644
--- a/crypto/encoding/amino/encode_test.go
+++ b/crypto/encoding/amino/encode_test.go
@@ -1,4 +1,4 @@
-package crypto
+package cryptoAmino
 
 import (
 	"os"
diff --git a/crypto/xsalsa20Symmetric/symmetric.go b/crypto/xsalsa20symmetric/symmetric.go
similarity index 98%
rename from crypto/xsalsa20Symmetric/symmetric.go
rename to crypto/xsalsa20symmetric/symmetric.go
index c7cd56752..d2369675d 100644
--- a/crypto/xsalsa20Symmetric/symmetric.go
+++ b/crypto/xsalsa20symmetric/symmetric.go
@@ -1,4 +1,4 @@
-package crypto
+package xsalsa20symmetric
 
 import (
 	"errors"
diff --git a/crypto/xsalsa20Symmetric/symmetric_test.go b/crypto/xsalsa20symmetric/symmetric_test.go
similarity index 97%
rename from crypto/xsalsa20Symmetric/symmetric_test.go
rename to crypto/xsalsa20symmetric/symmetric_test.go
index 704049e37..d955307ea 100644
--- a/crypto/xsalsa20Symmetric/symmetric_test.go
+++ b/crypto/xsalsa20symmetric/symmetric_test.go
@@ -1,4 +1,4 @@
-package crypto
+package xsalsa20symmetric
 
 import (
 	"testing"