diff --git a/cipher_chacha20.c b/cipher_chacha20.c
index c70ad05..e9423e6 100644
--- a/cipher_chacha20.c
+++ b/cipher_chacha20.c
@@ -32,7 +32,7 @@ chacha20_common_init_from(void *arg, const uint8_t *key, size_t keylen,
 	struct chacha20_ctx	*ctx = arg;
 	size_t			 i;
 
-	if (keylen != LC_CHACHA20_KEYLEN || ivlen != LC_CHACHA20_IVLEN)
+	if (keylen != LC_CHACHA20_KEYLEN || ivlen != LC_CHACHA20_NONCELEN)
 		return 0;
 
 	for (i = 0; i < CHACHA20_CHUNK_WORDS; i++)
@@ -61,7 +61,7 @@ xchacha20_common_init_from(void *arg, const uint8_t *key, size_t keylen,
 	struct chacha20_ctx	*ctx = arg;
 	size_t			 i;
 
-	if (keylen != LC_XCHACHA20_KEYLEN || ivlen != LC_XCHACHA20_IVLEN)
+	if (keylen != LC_XCHACHA20_KEYLEN || ivlen != LC_XCHACHA20_NONCELEN)
 		return 0;
 
 	for (i = 0; i < CHACHA20_CHUNK_WORDS; i++)
diff --git a/lilcrypto.h b/lilcrypto.h
index 50f6df1..cf7710d 100644
--- a/lilcrypto.h
+++ b/lilcrypto.h
@@ -38,9 +38,9 @@
 
 /* Ciphers. */
 #define LC_CHACHA20_KEYLEN	32
-#define LC_CHACHA20_IVLEN	12
+#define LC_CHACHA20_NONCELEN	12
 #define LC_XCHACHA20_KEYLEN	32
-#define LC_XCHACHA20_IVLEN	24
+#define LC_XCHACHA20_NONCELEN	24
 
 
 /*