diff --git a/configure.ac b/configure.ac
index 9349b89e22..670d9124a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.50 2003/08/01 00:26:22 fenrir Exp $
+dnl $Id: configure.ac,v 1.51 2003/08/01 00:40:05 fenrir Exp $
 
 AC_INIT(vlc,0.6.1)
 
@@ -767,7 +767,7 @@ dnl  default modules
 dnl
 #AX_ADD_BUILTINS([mpeg_video_old idct idctclassic motion])
 AX_ADD_PLUGINS([dummy rc logger gestures memcpy])
-AX_ADD_PLUGINS([es audio m4v mpeg_system ps ts avi asf aac mp4 rawdv])
+AX_ADD_PLUGINS([es mpga m4v mpeg_system ps ts avi asf aac mp4 rawdv])
 AX_ADD_PLUGINS([spudec mpeg_audio lpcm a52 dts cinepak])
 AX_ADD_PLUGINS([deinterlace invert adjust wall transform distort clone crop motionblur])
 AX_ADD_PLUGINS([float32tos16 float32tos8 float32tou16 float32tou8 a52tospdif dtstospdif fixed32tofloat32 fixed32tos16 s16tofixed32 s16tofloat32 s16tofloat32swab s8tofloat32 u8tofixed32 u8tofloat32])
diff --git a/modules/demux/aac.c b/modules/demux/aac.c
index b3b931bb00..add4547139 100644
--- a/modules/demux/aac.c
+++ b/modules/demux/aac.c
@@ -2,7 +2,7 @@
  * aac.c : Raw aac Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: aac.c,v 1.1 2003/08/01 00:08:35 fenrir Exp $
+ * $Id: aac.c,v 1.2 2003/08/01 00:40:05 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -34,14 +34,13 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-
-static int  Activate    ( vlc_object_t * );
-static void Deactivate  ( vlc_object_t * );
+static int  Open    ( vlc_object_t * );
+static void Close  ( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("AAC demuxer" ) );
     set_capability( "demux", 10 );
-    set_callbacks( Activate, Deactivate );
+    set_callbacks( Open, Close );
     add_shortcut( "aac" );
 vlc_module_end();
 
@@ -53,7 +52,6 @@ vlc_module_end();
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-
 static int  Demux       ( input_thread_t * );
 
 struct demux_sys_t
@@ -93,9 +91,9 @@ static inline int HeaderCheck( uint8_t *p )
 
 
 /*****************************************************************************
- * Activate: initializes AAC demux structures
+ * Open: initializes AAC demux structures
  *****************************************************************************/
-static int Activate( vlc_object_t * p_this )
+static int Open( vlc_object_t * p_this )
 {
     input_thread_t *p_input = (input_thread_t *)p_this;
     demux_sys_t    *p_sys;
@@ -308,9 +306,9 @@ static int Demux( input_thread_t * p_input )
 }
 
 /*****************************************************************************
- * Deactivate: frees unused data
+ * Close: frees unused data
  *****************************************************************************/
-static void Deactivate( vlc_object_t * p_this )
+static void Close( vlc_object_t * p_this )
 {
     input_thread_t *p_input = (input_thread_t*)p_this;
     demux_sys_t    *p_sys = p_input->p_demux_data;
diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index 058d56a788..3f5a931235 100644
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -2,7 +2,7 @@
  * wav.c : wav file input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: wav.c,v 1.1 2003/08/01 00:09:37 fenrir Exp $
+ * $Id: wav.c,v 1.2 2003/08/01 00:40:05 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -36,13 +36,13 @@
  * Module descriptor
  *****************************************************************************/
 
-static int  Activate    ( vlc_object_t * );
-static void Deactivate  ( vlc_object_t * );
+static int  Open    ( vlc_object_t * );
+static void Close  ( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("WAV demuxer") );
     set_capability( "demux", 142 );
-    set_callbacks( Activate, Deactivate );
+    set_callbacks( Open, Close );
 vlc_module_end();
 
 /*****************************************************************************
@@ -90,9 +90,9 @@ static void FrameInfo_MS_ADPCM ( input_thread_t *, unsigned int *, mtime_t * );
 static void FrameInfo_PCM      ( input_thread_t *, unsigned int *, mtime_t * );
 
 /*****************************************************************************
- * Activate: check file and initializes structures
+ * Open: check file and initializes structures
  *****************************************************************************/
-static int Activate( vlc_object_t * p_this )
+static int Open( vlc_object_t * p_this )
 {
     input_thread_t *p_input = (input_thread_t *)p_this;
     demux_sys_t    *p_sys;
@@ -341,9 +341,9 @@ static int Demux( input_thread_t *p_input )
 }
 
 /*****************************************************************************
- * Deactivate: frees unused data
+ * Close: frees unused data
  *****************************************************************************/
-static void Deactivate ( vlc_object_t * p_this )
+static void Close ( vlc_object_t * p_this )
 {
     input_thread_t *p_input = (input_thread_t *)p_this;
     demux_sys_t    *p_sys = p_input->p_demux_data;