diff --git a/crypto/chacha20poly1305aead.go b/crypto/chacha20poly1305_aead.go
similarity index 100%
rename from crypto/chacha20poly1305aead.go
rename to crypto/chacha20poly1305_aead.go
diff --git a/crypto/chacha20poly1305aead_test.go b/crypto/chacha20poly1305_aead_test.go
similarity index 100%
rename from crypto/chacha20poly1305aead_test.go
rename to crypto/chacha20poly1305_aead_test.go
diff --git a/crypto/NullAEAD.go b/crypto/null_aead.go
similarity index 100%
rename from crypto/NullAEAD.go
rename to crypto/null_aead.go
diff --git a/crypto/NullAEAD_test.go b/crypto/null_aead_test.go
similarity index 100%
rename from crypto/NullAEAD_test.go
rename to crypto/null_aead_test.go
diff --git a/handshake/handshake.go b/handshake/crypto_setup.go
similarity index 100%
rename from handshake/handshake.go
rename to handshake/crypto_setup.go
diff --git a/handshake/handshake_test.go b/handshake/crypto_setup_test.go
similarity index 100%
rename from handshake/handshake_test.go
rename to handshake/crypto_setup_test.go