diff --git a/include/polarssl/cipher.h b/include/polarssl/cipher.h
index 0f6dda5a8..f1196da3a 100644
--- a/include/polarssl/cipher.h
+++ b/include/polarssl/cipher.h
@@ -5,7 +5,7 @@
  *
  * \author Adriaan de Jong <dejong@fox-it.com>
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2011, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -167,7 +167,7 @@ typedef struct {
 } cipher_info_t;
 
 /**
- * Generic message digest context.
+ * Generic cipher context.
  */
 typedef struct {
     /** Information about the associated cipher */
@@ -392,7 +392,7 @@ int cipher_update( cipher_context_t *ctx, const unsigned char *input, size_t ile
  *                      contained within it will be padded with the size of
  *                      the last block, and written to the output buffer.
  *
- * \param ctx           Generic message digest context
+ * \param ctx           Generic cipher context
  * \param output        buffer to write data to. Needs block_size data available.
  * \param olen          length of the data written to the output buffer.
  *
diff --git a/include/polarssl/md.h b/include/polarssl/md.h
index aaafa8b88..eca86469d 100644
--- a/include/polarssl/md.h
+++ b/include/polarssl/md.h
@@ -5,7 +5,7 @@
  *
  * \author Adriaan de Jong <dejong@fox-it.com>
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2011, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -176,7 +176,7 @@ const md_info_t *md_info_from_type( md_type_t md_type );
  *
  * \returns        \c 0 on success, \c POLARSSL_ERR_MD_BAD_INPUT_DATA on
  *                 parameter failure, \c POLARSSL_ERR_MD_ALLOC_FAILED if
- *                 allocation of the cipher-specific context failed.
+ *                 allocation of the digest-specific context failed.
  */
 int md_init_ctx( md_context_t *ctx, const md_info_t *md_info );
 
diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c
index a7abf2a24..8edc06f37 100644
--- a/library/cipher_wrap.c
+++ b/library/cipher_wrap.c
@@ -1,11 +1,11 @@
 /**
  * \file md_wrap.c
  * 
- * \brief Generic message digest wrapper for PolarSSL
+ * \brief Generic cipher wrapper for PolarSSL
  *
  * \author Adriaan de Jong <dejong@fox-it.com>
  *
- *  Copyright (C) 2006-2010, Brainspark B.V.
+ *  Copyright (C) 2006-2011, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>