Index: src/pitch/pitch.h
===================================================================
--- src/pitch/pitch.h	(revision fddfa647d845149f90a4116483d287487f4b841c)
+++ src/pitch/pitch.h	(revision 3ac7cb09be6f375ae97b89eb535d6bb3734e3eb0)
@@ -41,6 +41,6 @@
 
   \param o pitch detection object as returned by new_aubio_pitch()
-  \param in input signal of size [hopsize x channels]
-  \param out output pitch candidates of size [1 x channes]
+  \param in input signal of size [hop_size x channels]
+  \param out output pitch candidates of size [1 x channels]
 
 */
@@ -64,13 +64,13 @@
 /** creation of the pitch detection object
 
-  \param mode set pitch detection algorithm
-  \param bufsize size of the input buffer to analyse
-  \param hopsize step size between two consecutive analysis instant
+  \param method set pitch detection algorithm
+  \param buf_size size of the input buffer to analyse
+  \param hop_size step size between two consecutive analysis instant
   \param channels number of channels to analyse
   \param samplerate sampling rate of the signal
 
 */
-aubio_pitch_t *new_aubio_pitch (char_t * mode,
-    uint_t bufsize, uint_t hopsize, uint_t channels, uint_t samplerate);
+aubio_pitch_t *new_aubio_pitch (char_t * method,
+    uint_t buf_size, uint_t hop_size, uint_t channels, uint_t samplerate);
 
 /** set the output unit of the pitch detection object 
Index: src/pitch/pitchfcomb.h
===================================================================
--- src/pitch/pitchfcomb.h	(revision fddfa647d845149f90a4116483d287487f4b841c)
+++ src/pitch/pitchfcomb.h	(revision 3ac7cb09be6f375ae97b89eb535d6bb3734e3eb0)
@@ -55,10 +55,10 @@
 /** creation of the pitch detection object
  
-  \param bufsize size of the input buffer to analyse 
-  \param hopsize step size between two consecutive analysis instant 
+  \param buf_size size of the input buffer to analyse 
+  \param hop_size step size between two consecutive analysis instant 
   \param channels number of channels to detect pitch on
  
 */
-aubio_pitchfcomb_t *new_aubio_pitchfcomb (uint_t bufsize, uint_t hopsize,
+aubio_pitchfcomb_t *new_aubio_pitchfcomb (uint_t buf_size, uint_t hop_size,
     uint_t channels);
 
Index: src/pitch/pitchmcomb.h
===================================================================
--- src/pitch/pitchmcomb.h	(revision fddfa647d845149f90a4116483d287487f4b841c)
+++ src/pitch/pitchmcomb.h	(revision 3ac7cb09be6f375ae97b89eb535d6bb3734e3eb0)
@@ -55,11 +55,11 @@
 /** creation of the pitch detection object
  
-  \param bufsize size of the input buffer to analyse 
-  \param hopsize step size between two consecutive analysis instant 
+  \param buf_size size of the input buffer to analyse 
+  \param hop_size step size between two consecutive analysis instant 
   \param channels number of channels to analyse
   \param samplerate sampling rate of the signal 
  
 */
-aubio_pitchmcomb_t *new_aubio_pitchmcomb (uint_t bufsize, uint_t hopsize,
+aubio_pitchmcomb_t *new_aubio_pitchmcomb (uint_t buf_size, uint_t hop_size,
     uint_t channels);
 
Index: src/pitch/pitchschmitt.h
===================================================================
--- src/pitch/pitchschmitt.h	(revision fddfa647d845149f90a4116483d287487f4b841c)
+++ src/pitch/pitchschmitt.h	(revision 3ac7cb09be6f375ae97b89eb535d6bb3734e3eb0)
@@ -55,8 +55,8 @@
 /** creation of the pitch detection object
  
-  \param size size of the input buffer to analyse 
+  \param buf_size size of the input buffer to analyse 
  
 */
-aubio_pitchschmitt_t *new_aubio_pitchschmitt (uint_t bufsize);
+aubio_pitchschmitt_t *new_aubio_pitchschmitt (uint_t buf_size);
 
 /** deletion of the pitch detection object
Index: src/pitch/pitchyin.h
===================================================================
--- src/pitch/pitchyin.h	(revision fddfa647d845149f90a4116483d287487f4b841c)
+++ src/pitch/pitchyin.h	(revision 3ac7cb09be6f375ae97b89eb535d6bb3734e3eb0)
@@ -45,8 +45,8 @@
 /** creation of the pitch detection object
  
-  \param bufsize size of the input buffer to analyse 
+  \param buf_size size of the input buffer to analyse 
  
 */
-aubio_pitchyin_t *new_aubio_pitchyin (uint_t bufsize);
+aubio_pitchyin_t *new_aubio_pitchyin (uint_t buf_size);
 
 /** deletion of the pitch detection object
Index: src/pitch/pitchyinfft.h
===================================================================
--- src/pitch/pitchyinfft.h	(revision fddfa647d845149f90a4116483d287487f4b841c)
+++ src/pitch/pitchyinfft.h	(revision 3ac7cb09be6f375ae97b89eb535d6bb3734e3eb0)
@@ -54,8 +54,8 @@
 /** creation of the pitch detection object
  
-  \param bufsize size of the input buffer to analyse 
+  \param buf_size size of the input buffer to analyse 
  
 */
-aubio_pitchyinfft_t *new_aubio_pitchyinfft (uint_t bufsize);
+aubio_pitchyinfft_t *new_aubio_pitchyinfft (uint_t buf_size);
 /** deletion of the pitch detection object
  
