diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index 8083c59964969ae39a23fa948c350e7cc48b7878..55822e1eda960fef5885bc265ede12894219ea95 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -23,7 +23,7 @@ $Id$
  * access_realrtsp: Real RTSP access
  * access_wasapi: WASAPI audio input
  * accesstweaks: access control tweaking module (dev tool)
- * adaptative: Unified adaptative streaming module (DASH/HLS)
+ * adaptive: Unified adaptive streaming module (DASH/HLS)
  * addonsfsstorage: Local storage extensions repository
  * addonsvorepository: Videolan extensions repository
  * adjust: Contrast/Hue/saturation/Brightness adjust module
diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index db63e7cefdda9009a11b386f176a018e56487ccf..5bbc732dbb455031c06454e53853356d9217a5d8 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -264,102 +264,102 @@ if HAVE_DVBPSI
 demux_LTLIBRARIES += libts_plugin.la
 endif
 
-libadaptative_plugin_la_SOURCES = \
-    demux/adaptative/playlist/AbstractPlaylist.cpp \
-    demux/adaptative/playlist/AbstractPlaylist.hpp \
-    demux/adaptative/playlist/BaseAdaptationSet.cpp \
-    demux/adaptative/playlist/BaseAdaptationSet.h \
-    demux/adaptative/playlist/BasePeriod.cpp \
-    demux/adaptative/playlist/BasePeriod.h \
-    demux/adaptative/playlist/BaseRepresentation.cpp \
-    demux/adaptative/playlist/BaseRepresentation.h \
-    demux/adaptative/playlist/CommonAttributesElements.cpp \
-    demux/adaptative/playlist/CommonAttributesElements.h \
-    demux/adaptative/playlist/ICanonicalUrl.hpp \
-    demux/adaptative/playlist/ID.hpp \
-    demux/adaptative/playlist/ID.cpp \
-    demux/adaptative/playlist/Inheritables.hpp \
-    demux/adaptative/playlist/Inheritables.cpp \
-    demux/adaptative/playlist/Segment.cpp \
-    demux/adaptative/playlist/Segment.h \
-    demux/adaptative/playlist/SegmentBase.cpp \
-    demux/adaptative/playlist/SegmentBase.h \
-    demux/adaptative/playlist/SegmentChunk.cpp \
-    demux/adaptative/playlist/SegmentChunk.hpp \
-    demux/adaptative/playlist/SegmentInfoCommon.cpp \
-    demux/adaptative/playlist/SegmentInfoCommon.h \
-    demux/adaptative/playlist/SegmentList.cpp \
-    demux/adaptative/playlist/SegmentList.h \
-    demux/adaptative/playlist/SegmentTimeline.cpp \
-    demux/adaptative/playlist/SegmentTimeline.h \
-    demux/adaptative/playlist/SegmentInformation.cpp \
-    demux/adaptative/playlist/SegmentInformation.hpp \
-    demux/adaptative/playlist/SegmentTemplate.cpp \
-    demux/adaptative/playlist/SegmentTemplate.h \
-    demux/adaptative/playlist/Url.cpp \
-    demux/adaptative/playlist/Url.hpp \
-    demux/adaptative/playlist/Templates.hpp \
-    demux/adaptative/logic/AbstractAdaptationLogic.cpp \
-    demux/adaptative/logic/AbstractAdaptationLogic.h \
-    demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp \
-    demux/adaptative/logic/AlwaysBestAdaptationLogic.h \
-    demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp \
-    demux/adaptative/logic/AlwaysLowestAdaptationLogic.hpp \
-    demux/adaptative/logic/IDownloadRateObserver.h \
-    demux/adaptative/logic/RateBasedAdaptationLogic.h \
-    demux/adaptative/logic/RateBasedAdaptationLogic.cpp \
-    demux/adaptative/logic/Representationselectors.hpp \
-    demux/adaptative/logic/Representationselectors.cpp \
-    demux/adaptative/mp4/AtomsReader.cpp \
-    demux/adaptative/mp4/AtomsReader.hpp \
-    demux/adaptative/http/BytesRange.cpp \
-    demux/adaptative/http/BytesRange.hpp \
-    demux/adaptative/http/Chunk.cpp \
-    demux/adaptative/http/Chunk.h \
-    demux/adaptative/http/Downloader.cpp \
-    demux/adaptative/http/Downloader.hpp \
-    demux/adaptative/http/HTTPConnection.cpp \
-    demux/adaptative/http/HTTPConnection.hpp \
-    demux/adaptative/http/HTTPConnectionManager.cpp \
-    demux/adaptative/http/HTTPConnectionManager.h \
-    demux/adaptative/http/Sockets.hpp \
-    demux/adaptative/http/Sockets.cpp \
-    demux/adaptative/plumbing/CommandsQueue.cpp \
-    demux/adaptative/plumbing/CommandsQueue.hpp \
-    demux/adaptative/plumbing/Demuxer.cpp \
-    demux/adaptative/plumbing/Demuxer.hpp \
-    demux/adaptative/plumbing/FakeESOut.cpp \
-    demux/adaptative/plumbing/FakeESOut.hpp \
-    demux/adaptative/plumbing/FakeESOutID.cpp \
-    demux/adaptative/plumbing/FakeESOutID.hpp \
-    demux/adaptative/plumbing/SourceStream.cpp \
-    demux/adaptative/plumbing/SourceStream.hpp \
-    demux/adaptative/ChunksSource.hpp \
-    demux/adaptative/PlaylistManager.cpp \
-    demux/adaptative/PlaylistManager.h \
-    demux/adaptative/SegmentTracker.cpp \
-    demux/adaptative/SegmentTracker.hpp \
-    demux/adaptative/StreamFormat.cpp \
-    demux/adaptative/StreamFormat.hpp \
-    demux/adaptative/Streams.cpp \
-    demux/adaptative/Streams.hpp \
-    demux/adaptative/Time.hpp \
-    demux/adaptative/tools/Conversions.hpp \
-    demux/adaptative/tools/Conversions.cpp \
-    demux/adaptative/tools/Debug.hpp \
-    demux/adaptative/tools/Helper.cpp \
-    demux/adaptative/tools/Helper.h \
-    demux/adaptative/tools/Properties.hpp \
-    demux/adaptative/tools/Retrieve.cpp \
-    demux/adaptative/tools/Retrieve.hpp \
-    demux/adaptative/xml/DOMHelper.cpp \
-    demux/adaptative/xml/DOMHelper.h \
-    demux/adaptative/xml/DOMParser.cpp \
-    demux/adaptative/xml/DOMParser.h \
-    demux/adaptative/xml/Node.cpp \
-    demux/adaptative/xml/Node.h
-
-libadaptative_dash_SOURCES = \
+libadaptive_plugin_la_SOURCES = \
+    demux/adaptive/playlist/AbstractPlaylist.cpp \
+    demux/adaptive/playlist/AbstractPlaylist.hpp \
+    demux/adaptive/playlist/BaseAdaptationSet.cpp \
+    demux/adaptive/playlist/BaseAdaptationSet.h \
+    demux/adaptive/playlist/BasePeriod.cpp \
+    demux/adaptive/playlist/BasePeriod.h \
+    demux/adaptive/playlist/BaseRepresentation.cpp \
+    demux/adaptive/playlist/BaseRepresentation.h \
+    demux/adaptive/playlist/CommonAttributesElements.cpp \
+    demux/adaptive/playlist/CommonAttributesElements.h \
+    demux/adaptive/playlist/ICanonicalUrl.hpp \
+    demux/adaptive/playlist/ID.hpp \
+    demux/adaptive/playlist/ID.cpp \
+    demux/adaptive/playlist/Inheritables.hpp \
+    demux/adaptive/playlist/Inheritables.cpp \
+    demux/adaptive/playlist/Segment.cpp \
+    demux/adaptive/playlist/Segment.h \
+    demux/adaptive/playlist/SegmentBase.cpp \
+    demux/adaptive/playlist/SegmentBase.h \
+    demux/adaptive/playlist/SegmentChunk.cpp \
+    demux/adaptive/playlist/SegmentChunk.hpp \
+    demux/adaptive/playlist/SegmentInfoCommon.cpp \
+    demux/adaptive/playlist/SegmentInfoCommon.h \
+    demux/adaptive/playlist/SegmentList.cpp \
+    demux/adaptive/playlist/SegmentList.h \
+    demux/adaptive/playlist/SegmentTimeline.cpp \
+    demux/adaptive/playlist/SegmentTimeline.h \
+    demux/adaptive/playlist/SegmentInformation.cpp \
+    demux/adaptive/playlist/SegmentInformation.hpp \
+    demux/adaptive/playlist/SegmentTemplate.cpp \
+    demux/adaptive/playlist/SegmentTemplate.h \
+    demux/adaptive/playlist/Url.cpp \
+    demux/adaptive/playlist/Url.hpp \
+    demux/adaptive/playlist/Templates.hpp \
+    demux/adaptive/logic/AbstractAdaptationLogic.cpp \
+    demux/adaptive/logic/AbstractAdaptationLogic.h \
+    demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp \
+    demux/adaptive/logic/AlwaysBestAdaptationLogic.h \
+    demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp \
+    demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp \
+    demux/adaptive/logic/IDownloadRateObserver.h \
+    demux/adaptive/logic/RateBasedAdaptationLogic.h \
+    demux/adaptive/logic/RateBasedAdaptationLogic.cpp \
+    demux/adaptive/logic/Representationselectors.hpp \
+    demux/adaptive/logic/Representationselectors.cpp \
+    demux/adaptive/mp4/AtomsReader.cpp \
+    demux/adaptive/mp4/AtomsReader.hpp \
+    demux/adaptive/http/BytesRange.cpp \
+    demux/adaptive/http/BytesRange.hpp \
+    demux/adaptive/http/Chunk.cpp \
+    demux/adaptive/http/Chunk.h \
+    demux/adaptive/http/Downloader.cpp \
+    demux/adaptive/http/Downloader.hpp \
+    demux/adaptive/http/HTTPConnection.cpp \
+    demux/adaptive/http/HTTPConnection.hpp \
+    demux/adaptive/http/HTTPConnectionManager.cpp \
+    demux/adaptive/http/HTTPConnectionManager.h \
+    demux/adaptive/http/Sockets.hpp \
+    demux/adaptive/http/Sockets.cpp \
+    demux/adaptive/plumbing/CommandsQueue.cpp \
+    demux/adaptive/plumbing/CommandsQueue.hpp \
+    demux/adaptive/plumbing/Demuxer.cpp \
+    demux/adaptive/plumbing/Demuxer.hpp \
+    demux/adaptive/plumbing/FakeESOut.cpp \
+    demux/adaptive/plumbing/FakeESOut.hpp \
+    demux/adaptive/plumbing/FakeESOutID.cpp \
+    demux/adaptive/plumbing/FakeESOutID.hpp \
+    demux/adaptive/plumbing/SourceStream.cpp \
+    demux/adaptive/plumbing/SourceStream.hpp \
+    demux/adaptive/ChunksSource.hpp \
+    demux/adaptive/PlaylistManager.cpp \
+    demux/adaptive/PlaylistManager.h \
+    demux/adaptive/SegmentTracker.cpp \
+    demux/adaptive/SegmentTracker.hpp \
+    demux/adaptive/StreamFormat.cpp \
+    demux/adaptive/StreamFormat.hpp \
+    demux/adaptive/Streams.cpp \
+    demux/adaptive/Streams.hpp \
+    demux/adaptive/Time.hpp \
+    demux/adaptive/tools/Conversions.hpp \
+    demux/adaptive/tools/Conversions.cpp \
+    demux/adaptive/tools/Debug.hpp \
+    demux/adaptive/tools/Helper.cpp \
+    demux/adaptive/tools/Helper.h \
+    demux/adaptive/tools/Properties.hpp \
+    demux/adaptive/tools/Retrieve.cpp \
+    demux/adaptive/tools/Retrieve.hpp \
+    demux/adaptive/xml/DOMHelper.cpp \
+    demux/adaptive/xml/DOMHelper.h \
+    demux/adaptive/xml/DOMParser.cpp \
+    demux/adaptive/xml/DOMParser.h \
+    demux/adaptive/xml/Node.cpp \
+    demux/adaptive/xml/Node.h
+
+libadaptive_dash_SOURCES = \
     demux/dash/mpd/AdaptationSet.cpp \
     demux/dash/mpd/AdaptationSet.h \
     demux/dash/mpd/DASHCommonAttributesElements.cpp \
@@ -389,7 +389,7 @@ libadaptative_dash_SOURCES = \
     demux/dash/DASHStream.cpp \
     demux/dash/DASHStream.hpp
 
-libadaptative_hls_SOURCES = \
+libadaptive_hls_SOURCES = \
     demux/hls/playlist/M3U8.hpp \
     demux/hls/playlist/M3U8.cpp \
     demux/hls/playlist/Parser.hpp \
@@ -405,7 +405,7 @@ libadaptative_hls_SOURCES = \
     demux/hls/HLSStreams.hpp \
     demux/hls/HLSStreams.cpp
 
-libadaptative_smooth_SOURCES = \
+libadaptive_smooth_SOURCES = \
     demux/smooth/mp4/IndexReader.cpp \
     demux/smooth/mp4/IndexReader.hpp \
     demux/smooth/playlist/ForgedInitSegment.hpp \
@@ -424,24 +424,24 @@ libadaptative_smooth_SOURCES = \
     demux/smooth/SmoothManager.cpp \
     demux/smooth/SmoothStream.hpp \
     demux/smooth/SmoothStream.cpp
-libadaptative_smooth_SOURCES += mux/mp4/libmp4mux.c mux/mp4/libmp4mux.h \
+libadaptive_smooth_SOURCES += mux/mp4/libmp4mux.c mux/mp4/libmp4mux.h \
 				packetizer/h264_nal.c packetizer/h264_nal.h
 
-libadaptative_plugin_la_SOURCES += $(libadaptative_hls_SOURCES)
-libadaptative_plugin_la_SOURCES += $(libadaptative_dash_SOURCES)
-libadaptative_plugin_la_SOURCES += $(libadaptative_smooth_SOURCES)
-libadaptative_plugin_la_SOURCES += demux/adaptative/adaptative.cpp
-libadaptative_plugin_la_SOURCES += demux/mp4/libmp4.c demux/mp4/libmp4.h
-libadaptative_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir)/demux/adaptative
-libadaptative_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM)
+libadaptive_plugin_la_SOURCES += $(libadaptive_hls_SOURCES)
+libadaptive_plugin_la_SOURCES += $(libadaptive_dash_SOURCES)
+libadaptive_plugin_la_SOURCES += $(libadaptive_smooth_SOURCES)
+libadaptive_plugin_la_SOURCES += demux/adaptive/adaptive.cpp
+libadaptive_plugin_la_SOURCES += demux/mp4/libmp4.c demux/mp4/libmp4.h
+libadaptive_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir)/demux/adaptive
+libadaptive_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM)
 if HAVE_ZLIB
-libadaptative_plugin_la_LIBADD += -lz
+libadaptive_plugin_la_LIBADD += -lz
 endif
 if HAVE_GCRYPT
-libadaptative_plugin_la_CXXFLAGS += $(GCRYPT_CFLAGS)
-libadaptative_plugin_la_LIBADD += $(GCRYPT_LIBS)
+libadaptive_plugin_la_CXXFLAGS += $(GCRYPT_CFLAGS)
+libadaptive_plugin_la_LIBADD += $(GCRYPT_LIBS)
 endif
-demux_LTLIBRARIES += libadaptative_plugin.la
+demux_LTLIBRARIES += libadaptive_plugin.la
 
 libttml_plugin_la_SOURCES = demux/ttml.c
 demux_LTLIBRARIES += libttml_plugin.la
diff --git a/modules/demux/adaptative/ChunksSource.hpp b/modules/demux/adaptive/ChunksSource.hpp
similarity index 98%
rename from modules/demux/adaptative/ChunksSource.hpp
rename to modules/demux/adaptive/ChunksSource.hpp
index 52ee7fe2ad97c9f4763fb743a806f8ba3745d889..c5796019678b60d8e4c46beb997372d99c558d57 100644
--- a/modules/demux/adaptative/ChunksSource.hpp
+++ b/modules/demux/adaptive/ChunksSource.hpp
@@ -26,7 +26,7 @@
 
 #include <vlc_common.h>
 
-namespace adaptative
+namespace adaptive
 {
     class ChunksSource
     {
diff --git a/modules/demux/adaptative/PlaylistManager.cpp b/modules/demux/adaptive/PlaylistManager.cpp
similarity index 97%
rename from modules/demux/adaptative/PlaylistManager.cpp
rename to modules/demux/adaptive/PlaylistManager.cpp
index 52e4467075b8c550f1f22cf031c56765ca60bdff..0011533394c9645b0a8e5305c3929d08884374f3 100644
--- a/modules/demux/adaptative/PlaylistManager.cpp
+++ b/modules/demux/adaptive/PlaylistManager.cpp
@@ -39,9 +39,9 @@
 
 #include <ctime>
 
-using namespace adaptative::http;
-using namespace adaptative::logic;
-using namespace adaptative;
+using namespace adaptive::http;
+using namespace adaptive::logic;
+using namespace adaptive;
 
 PlaylistManager::PlaylistManager( demux_t *p_demux_,
                                   AbstractPlaylist *pl,
@@ -444,7 +444,7 @@ AbstractAdaptationLogic *PlaylistManager::createLogic(AbstractAdaptationLogic::L
     {
         case AbstractAdaptationLogic::FixedRate:
         {
-            size_t bps = var_InheritInteger(p_demux, "adaptative-bw") * 8192;
+            size_t bps = var_InheritInteger(p_demux, "adaptive-bw") * 8192;
             return new (std::nothrow) FixedRateAdaptationLogic(bps);
         }
         case AbstractAdaptationLogic::AlwaysLowest:
@@ -454,8 +454,8 @@ AbstractAdaptationLogic *PlaylistManager::createLogic(AbstractAdaptationLogic::L
         case AbstractAdaptationLogic::Default:
         case AbstractAdaptationLogic::RateBased:
         {
-            int width = var_InheritInteger(p_demux, "adaptative-width");
-            int height = var_InheritInteger(p_demux, "adaptative-height");
+            int width = var_InheritInteger(p_demux, "adaptive-width");
+            int height = var_InheritInteger(p_demux, "adaptive-height");
             RateBasedAdaptationLogic *logic =
                     new (std::nothrow) RateBasedAdaptationLogic(VLC_OBJECT(p_demux), width, height);
             conn->setDownloadRateObserver(logic);
diff --git a/modules/demux/adaptative/PlaylistManager.h b/modules/demux/adaptive/PlaylistManager.h
similarity index 99%
rename from modules/demux/adaptative/PlaylistManager.h
rename to modules/demux/adaptive/PlaylistManager.h
index a6fbf293d6268305e97e5eb4563385592135b116..d2ddd4cd162f5e4db01b8389d0b9b67ce9a498f7 100644
--- a/modules/demux/adaptative/PlaylistManager.h
+++ b/modules/demux/adaptive/PlaylistManager.h
@@ -26,7 +26,7 @@
 #include "Streams.hpp"
 #include <vector>
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/SegmentTracker.cpp b/modules/demux/adaptive/SegmentTracker.cpp
similarity index 98%
rename from modules/demux/adaptative/SegmentTracker.cpp
rename to modules/demux/adaptive/SegmentTracker.cpp
index a36eaf7fa5fa16fb0b99be4da97fc525418c0573..48214ec724779846a2faab246236fe6ed4c257fc 100644
--- a/modules/demux/adaptative/SegmentTracker.cpp
+++ b/modules/demux/adaptive/SegmentTracker.cpp
@@ -25,9 +25,9 @@
 #include "playlist/SegmentChunk.hpp"
 #include "logic/AbstractAdaptationLogic.h"
 
-using namespace adaptative;
-using namespace adaptative::logic;
-using namespace adaptative::playlist;
+using namespace adaptive;
+using namespace adaptive::logic;
+using namespace adaptive::playlist;
 
 SegmentTrackerEvent::SegmentTrackerEvent(SegmentChunk *s)
 {
diff --git a/modules/demux/adaptative/SegmentTracker.hpp b/modules/demux/adaptive/SegmentTracker.hpp
similarity index 99%
rename from modules/demux/adaptative/SegmentTracker.hpp
rename to modules/demux/adaptive/SegmentTracker.hpp
index b80a642d0a6764f51e2969cfd77bcda101cd7e10..3a668fee5d1be070f155fffa87f68ba2fcb56d9b 100644
--- a/modules/demux/adaptative/SegmentTracker.hpp
+++ b/modules/demux/adaptive/SegmentTracker.hpp
@@ -29,7 +29,7 @@
 #include <vlc_common.h>
 #include <list>
 
-namespace adaptative
+namespace adaptive
 {
     namespace http
     {
diff --git a/modules/demux/adaptative/StreamFormat.cpp b/modules/demux/adaptive/StreamFormat.cpp
similarity index 98%
rename from modules/demux/adaptative/StreamFormat.cpp
rename to modules/demux/adaptive/StreamFormat.cpp
index 362696967c947758ea826d3d2075359fd848b84c..889167bb28ada38afbc06d0944de5a1ad8c1d806 100644
--- a/modules/demux/adaptative/StreamFormat.cpp
+++ b/modules/demux/adaptive/StreamFormat.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 #include "StreamFormat.hpp"
 
-using namespace adaptative;
+using namespace adaptive;
 
 StreamFormat::operator unsigned() const
 {
diff --git a/modules/demux/adaptative/StreamFormat.hpp b/modules/demux/adaptive/StreamFormat.hpp
similarity index 98%
rename from modules/demux/adaptative/StreamFormat.hpp
rename to modules/demux/adaptive/StreamFormat.hpp
index e729f3ef06a81cfb0a142cdb5cf696c5236d4aa6..b4a978feab067ce8458901e746efbe4be9cb530a 100644
--- a/modules/demux/adaptative/StreamFormat.hpp
+++ b/modules/demux/adaptive/StreamFormat.hpp
@@ -22,7 +22,7 @@
 
 #include <string>
 
-namespace adaptative
+namespace adaptive
 {
 
     class StreamFormat
diff --git a/modules/demux/adaptative/Streams.cpp b/modules/demux/adaptive/Streams.cpp
similarity index 99%
rename from modules/demux/adaptative/Streams.cpp
rename to modules/demux/adaptive/Streams.cpp
index 31bfe6f2833cfb1acb36986667b11afb7b658330..a32bbe005c50854449f9795f0215b3502b50c3aa 100644
--- a/modules/demux/adaptative/Streams.cpp
+++ b/modules/demux/adaptive/Streams.cpp
@@ -27,8 +27,8 @@
 #include "tools/Debug.hpp"
 #include <vlc_demux.h>
 
-using namespace adaptative;
-using namespace adaptative::http;
+using namespace adaptive;
+using namespace adaptive::http;
 
 AbstractStream::AbstractStream(demux_t * demux_, const StreamFormat &format_)
 {
diff --git a/modules/demux/adaptative/Streams.hpp b/modules/demux/adaptive/Streams.hpp
similarity index 99%
rename from modules/demux/adaptative/Streams.hpp
rename to modules/demux/adaptive/Streams.hpp
index 8155c39523f4df69ef92b19d6a267edb8092e42d..5a64118bb42930fa5e29c40423e7076bc94e4cb4 100644
--- a/modules/demux/adaptative/Streams.hpp
+++ b/modules/demux/adaptive/Streams.hpp
@@ -35,7 +35,7 @@
 
 #include <string>
 
-namespace adaptative
+namespace adaptive
 {
     class SegmentTracker;
 
diff --git a/modules/demux/adaptative/Time.hpp b/modules/demux/adaptive/Time.hpp
similarity index 100%
rename from modules/demux/adaptative/Time.hpp
rename to modules/demux/adaptive/Time.hpp
diff --git a/modules/demux/adaptative/adaptative.cpp b/modules/demux/adaptive/adaptive.cpp
similarity index 92%
rename from modules/demux/adaptative/adaptative.cpp
rename to modules/demux/adaptive/adaptive.cpp
index ea860b1686377be4aeb9c37d475516196a15fe26..8ac22cb6d19d73f89fe485ccbcc093c50348ad6a 100644
--- a/modules/demux/adaptative/adaptative.cpp
+++ b/modules/demux/adaptive/adaptive.cpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * adaptative.cpp: Adaptative streaming module
+ * adaptive.cpp: Adaptative streaming module
  *****************************************************************************
  * Copyright © 2015 - VideoLAN and VLC Authors
  *
@@ -47,9 +47,9 @@
 #include "../smooth/SmoothStream.hpp"
 #include "../smooth/playlist/Parser.hpp"
 
-using namespace adaptative::logic;
-using namespace adaptative::playlist;
-using namespace adaptative::xml;
+using namespace adaptive::logic;
+using namespace adaptive::playlist;
+using namespace adaptive::xml;
 using namespace dash::mpd;
 using namespace dash;
 using namespace hls;
@@ -68,7 +68,7 @@ static void Close   (vlc_object_t *);
 #define ADAPT_HEIGHT_TEXT N_("Preferred Height")
 
 #define ADAPT_BW_TEXT N_("Fixed Bandwidth in KiB/s")
-#define ADAPT_BW_LONGTEXT N_("Preferred bandwidth for non adaptative streams")
+#define ADAPT_BW_LONGTEXT N_("Preferred bandwidth for non adaptive streams")
 
 #define ADAPT_LOGIC_TEXT N_("Adaptation Logic")
 
@@ -84,16 +84,16 @@ static const char *const ppsz_logics[] = { N_("Bandwidth Adaptive"),
 
 vlc_module_begin ()
         set_shortname( N_("Adaptative"))
-        set_description( N_("Unified adaptative streaming for DASH/HLS") )
+        set_description( N_("Unified adaptive streaming for DASH/HLS") )
         set_capability( "demux", 12 )
         set_category( CAT_INPUT )
         set_subcategory( SUBCAT_INPUT_DEMUX )
-        add_integer( "adaptative-logic",  AbstractAdaptationLogic::Default,
+        add_integer( "adaptive-logic",  AbstractAdaptationLogic::Default,
                                           ADAPT_LOGIC_TEXT, NULL, false )
             change_integer_list( pi_logics, ppsz_logics )
-        add_integer( "adaptative-width",  480, ADAPT_WIDTH_TEXT,  ADAPT_WIDTH_TEXT,  true )
-        add_integer( "adaptative-height", 360, ADAPT_HEIGHT_TEXT, ADAPT_HEIGHT_TEXT, true )
-        add_integer( "adaptative-bw",     250, ADAPT_BW_TEXT,     ADAPT_BW_LONGTEXT,     false )
+        add_integer( "adaptive-width",  480, ADAPT_WIDTH_TEXT,  ADAPT_WIDTH_TEXT,  true )
+        add_integer( "adaptive-height", 360, ADAPT_HEIGHT_TEXT, ADAPT_HEIGHT_TEXT, true )
+        add_integer( "adaptive-bw",     250, ADAPT_BW_TEXT,     ADAPT_BW_LONGTEXT,     false )
         set_callbacks( Open, Close )
 vlc_module_end ()
 
@@ -123,7 +123,7 @@ static int Open(vlc_object_t *p_obj)
 
     PlaylistManager *p_manager = NULL;
     AbstractAdaptationLogic::LogicType logic =
-            static_cast<AbstractAdaptationLogic::LogicType>(var_InheritInteger(p_obj, "adaptative-logic"));
+            static_cast<AbstractAdaptationLogic::LogicType>(var_InheritInteger(p_obj, "adaptive-logic"));
 
     std::string playlisturl(p_demux->psz_access);
     playlisturl.append("://");
diff --git a/modules/demux/adaptative/http/BytesRange.cpp b/modules/demux/adaptive/http/BytesRange.cpp
similarity index 97%
rename from modules/demux/adaptative/http/BytesRange.cpp
rename to modules/demux/adaptive/http/BytesRange.cpp
index 13cc7cde50ef980d5188e833bbbceffd2b714b6f..58c198fed22f813bf9214d7f36a4f4b403e11774 100644
--- a/modules/demux/adaptative/http/BytesRange.cpp
+++ b/modules/demux/adaptive/http/BytesRange.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 #include "BytesRange.hpp"
 
-using namespace adaptative::http;
+using namespace adaptive::http;
 
 BytesRange::BytesRange()
 {
diff --git a/modules/demux/adaptative/http/BytesRange.hpp b/modules/demux/adaptive/http/BytesRange.hpp
similarity index 98%
rename from modules/demux/adaptative/http/BytesRange.hpp
rename to modules/demux/adaptive/http/BytesRange.hpp
index b4b58fccbf526a6b809cebe4eccbf94f332f9eac..4e7a8f433f2d539d8aa39eb4eb2f23c7d473769e 100644
--- a/modules/demux/adaptative/http/BytesRange.hpp
+++ b/modules/demux/adaptive/http/BytesRange.hpp
@@ -26,7 +26,7 @@
 
 #include <vlc_common.h>
 
-namespace adaptative
+namespace adaptive
 {
     namespace http
     {
diff --git a/modules/demux/adaptative/http/Chunk.cpp b/modules/demux/adaptive/http/Chunk.cpp
similarity index 99%
rename from modules/demux/adaptative/http/Chunk.cpp
rename to modules/demux/adaptive/http/Chunk.cpp
index e1a2280d586908b3bd1c5cdbf0f94164a2ea1302..cd5dcf1d7f0b9dcea315aee721c08c6f094320ab 100644
--- a/modules/demux/adaptative/http/Chunk.cpp
+++ b/modules/demux/adaptive/http/Chunk.cpp
@@ -36,7 +36,7 @@
 
 #include <algorithm>
 
-using namespace adaptative::http;
+using namespace adaptive::http;
 
 AbstractChunkSource::AbstractChunkSource()
 {
diff --git a/modules/demux/adaptative/http/Chunk.h b/modules/demux/adaptive/http/Chunk.h
similarity index 99%
rename from modules/demux/adaptative/http/Chunk.h
rename to modules/demux/adaptive/http/Chunk.h
index 0e632b76d0a7ccc1805ae9fbf5d10d8b489d12b1..63c6d340212bd38c99c3845530385c4832abbfcc 100644
--- a/modules/demux/adaptative/http/Chunk.h
+++ b/modules/demux/adaptive/http/Chunk.h
@@ -32,7 +32,7 @@
 
 typedef struct block_t block_t;
 
-namespace adaptative
+namespace adaptive
 {
     namespace http
     {
diff --git a/modules/demux/adaptative/http/Downloader.cpp b/modules/demux/adaptive/http/Downloader.cpp
similarity index 98%
rename from modules/demux/adaptative/http/Downloader.cpp
rename to modules/demux/adaptive/http/Downloader.cpp
index 97fc43a17a2b5f95c09d073f5f0e0ff7a2a56c0a..ec6e0a30ab537f32f1433a0398164420f0536009 100644
--- a/modules/demux/adaptative/http/Downloader.cpp
+++ b/modules/demux/adaptive/http/Downloader.cpp
@@ -22,7 +22,7 @@
 #include <vlc_threads.h>
 #include <vlc_atomic.h>
 
-using namespace adaptative::http;
+using namespace adaptive::http;
 
 Downloader::Downloader()
 {
diff --git a/modules/demux/adaptative/http/Downloader.hpp b/modules/demux/adaptive/http/Downloader.hpp
similarity index 98%
rename from modules/demux/adaptative/http/Downloader.hpp
rename to modules/demux/adaptive/http/Downloader.hpp
index 2555a70ab36d3f387edcb391d9ca3b6702c925a3..ec9fe8dd1d878638ea9725b78be8a8aafd373b2e 100644
--- a/modules/demux/adaptative/http/Downloader.hpp
+++ b/modules/demux/adaptive/http/Downloader.hpp
@@ -29,7 +29,7 @@
 #include <vlc_common.h>
 #include <list>
 
-namespace adaptative
+namespace adaptive
 {
 
     namespace http
diff --git a/modules/demux/adaptative/http/HTTPConnection.cpp b/modules/demux/adaptive/http/HTTPConnection.cpp
similarity index 98%
rename from modules/demux/adaptative/http/HTTPConnection.cpp
rename to modules/demux/adaptive/http/HTTPConnection.cpp
index dd148ead849ae49ffc00b6a476b9f95e1063fd87..9ffb79caf56c690672c8ee14b3cbc0e7d658d495 100644
--- a/modules/demux/adaptative/http/HTTPConnection.cpp
+++ b/modules/demux/adaptive/http/HTTPConnection.cpp
@@ -20,11 +20,11 @@
 
 #include "HTTPConnection.hpp"
 #include "Sockets.hpp"
-#include "../adaptative/tools/Helper.h"
+#include "../adaptive/tools/Helper.h"
 
 #include <sstream>
 
-using namespace adaptative::http;
+using namespace adaptive::http;
 
 HTTPConnection::HTTPConnection(vlc_object_t *stream_, Socket *socket_, bool persistent)
 {
diff --git a/modules/demux/adaptative/http/HTTPConnection.hpp b/modules/demux/adaptive/http/HTTPConnection.hpp
similarity index 99%
rename from modules/demux/adaptative/http/HTTPConnection.hpp
rename to modules/demux/adaptive/http/HTTPConnection.hpp
index ffb561e3b8d6f99bfe09a23aa526b5bb4ebcd1c5..5364b079f40a9fd46bf0aab43b770a9a0b9d3f65 100644
--- a/modules/demux/adaptative/http/HTTPConnection.hpp
+++ b/modules/demux/adaptive/http/HTTPConnection.hpp
@@ -33,7 +33,7 @@
 #include <vlc_common.h>
 #include <string>
 
-namespace adaptative
+namespace adaptive
 {
     namespace http
     {
diff --git a/modules/demux/adaptative/http/HTTPConnectionManager.cpp b/modules/demux/adaptive/http/HTTPConnectionManager.cpp
similarity index 99%
rename from modules/demux/adaptative/http/HTTPConnectionManager.cpp
rename to modules/demux/adaptive/http/HTTPConnectionManager.cpp
index e828e1e79683a04d3cb190935d529227d0ddf2df..4ab978683f6b12d596cdd308fa556a6ebeeb520c 100644
--- a/modules/demux/adaptative/http/HTTPConnectionManager.cpp
+++ b/modules/demux/adaptive/http/HTTPConnectionManager.cpp
@@ -31,7 +31,7 @@
 #include "Downloader.hpp"
 #include <vlc_url.h>
 
-using namespace adaptative::http;
+using namespace adaptive::http;
 
 HTTPConnectionManager::HTTPConnectionManager    (vlc_object_t *stream) :
                        stream                   (stream),
diff --git a/modules/demux/adaptative/http/HTTPConnectionManager.h b/modules/demux/adaptive/http/HTTPConnectionManager.h
similarity index 99%
rename from modules/demux/adaptative/http/HTTPConnectionManager.h
rename to modules/demux/adaptive/http/HTTPConnectionManager.h
index af6044ed2a6cdaf7e2bdd3beb9729095dbf44fd6..877cd76f55bff30c6d221ef4013e3bdd3ed79803 100644
--- a/modules/demux/adaptative/http/HTTPConnectionManager.h
+++ b/modules/demux/adaptive/http/HTTPConnectionManager.h
@@ -35,7 +35,7 @@
 #include <vector>
 #include <string>
 
-namespace adaptative
+namespace adaptive
 {
     namespace http
     {
diff --git a/modules/demux/adaptative/http/Sockets.cpp b/modules/demux/adaptive/http/Sockets.cpp
similarity index 99%
rename from modules/demux/adaptative/http/Sockets.cpp
rename to modules/demux/adaptive/http/Sockets.cpp
index f98cd1b5ad6f97e5f63f55602d9955777ab4b118..753c3545b9e9056d1dbc51bd46178dc02675ae1a 100644
--- a/modules/demux/adaptative/http/Sockets.cpp
+++ b/modules/demux/adaptive/http/Sockets.cpp
@@ -22,7 +22,7 @@
 #include <vlc_network.h>
 #include <cerrno>
 
-using namespace adaptative::http;
+using namespace adaptive::http;
 
 Socket::Socket()
 {
diff --git a/modules/demux/adaptative/http/Sockets.hpp b/modules/demux/adaptive/http/Sockets.hpp
similarity index 99%
rename from modules/demux/adaptative/http/Sockets.hpp
rename to modules/demux/adaptive/http/Sockets.hpp
index 09608d7ad84ca73e0b7b45bea1551e26a2923667..c5187bfa9105380d05eedd458271198201412ec4 100644
--- a/modules/demux/adaptative/http/Sockets.hpp
+++ b/modules/demux/adaptive/http/Sockets.hpp
@@ -28,7 +28,7 @@
 #include <vlc_tls.h>
 #include <string>
 
-namespace adaptative
+namespace adaptive
 {
     namespace http
     {
diff --git a/modules/demux/adaptative/logic/AbstractAdaptationLogic.cpp b/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp
similarity index 97%
rename from modules/demux/adaptative/logic/AbstractAdaptationLogic.cpp
rename to modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp
index 0e1e2e7c673a2367309f65e2210e02bdebec8234..3197f091e7d46dd065eb9de05d5bcf7f3cfd5b50 100644
--- a/modules/demux/adaptative/logic/AbstractAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp
@@ -27,7 +27,7 @@
 
 #include "AbstractAdaptationLogic.h"
 
-using namespace adaptative::logic;
+using namespace adaptive::logic;
 
 AbstractAdaptationLogic::AbstractAdaptationLogic    ()
 {
diff --git a/modules/demux/adaptative/logic/AbstractAdaptationLogic.h b/modules/demux/adaptive/logic/AbstractAdaptationLogic.h
similarity index 99%
rename from modules/demux/adaptative/logic/AbstractAdaptationLogic.h
rename to modules/demux/adaptive/logic/AbstractAdaptationLogic.h
index a456a3da5143a823c80c0d9c8ac001295731ade9..526e3bb8545ed954919e0f3fd67ed51fd99dae54 100644
--- a/modules/demux/adaptative/logic/AbstractAdaptationLogic.h
+++ b/modules/demux/adaptive/logic/AbstractAdaptationLogic.h
@@ -28,7 +28,7 @@
 #include "IDownloadRateObserver.h"
 #include "../SegmentTracker.hpp"
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
similarity index 95%
rename from modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp
rename to modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
index bc43a4df94f0122cf48f38c24809bb597c97b40e..0ba222b236d7d367618770e7661771b1aacc1053 100644
--- a/modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
@@ -28,8 +28,8 @@
 #include "AlwaysBestAdaptationLogic.h"
 #include "Representationselectors.hpp"
 
-using namespace adaptative::logic;
-using namespace adaptative::playlist;
+using namespace adaptive::logic;
+using namespace adaptive::playlist;
 
 AlwaysBestAdaptationLogic::AlwaysBestAdaptationLogic    () :
                            AbstractAdaptationLogic      ()
diff --git a/modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.h b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h
similarity index 98%
rename from modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.h
rename to modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h
index 4495946a3a75500e077598859fa90b4c044d5dd4..9de0ab2686b4435d0434e97d11a25109fa56b2ee 100644
--- a/modules/demux/adaptative/logic/AlwaysBestAdaptationLogic.h
+++ b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.h
@@ -27,7 +27,7 @@
 
 #include "AbstractAdaptationLogic.h"
 
-namespace adaptative
+namespace adaptive
 {
     namespace logic
     {
diff --git a/modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp
similarity index 94%
rename from modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp
rename to modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp
index 38bb8216ddb918a7d55f1ec835d5148f1d6a06d1..ed20cf071ae05ea53006546b1dee64f48da0f31b 100644
--- a/modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp
@@ -20,8 +20,8 @@
 #include "AlwaysLowestAdaptationLogic.hpp"
 #include "Representationselectors.hpp"
 
-using namespace adaptative::logic;
-using namespace adaptative::playlist;
+using namespace adaptive::logic;
+using namespace adaptive::playlist;
 
 AlwaysLowestAdaptationLogic::AlwaysLowestAdaptationLogic():
     AbstractAdaptationLogic()
diff --git a/modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.hpp b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp
similarity index 98%
rename from modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.hpp
rename to modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp
index 4876d2dda958845bda0b454c7a7bfd3250229e87..f972f02b958ed9a693833840b2bc1e2e907485fd 100644
--- a/modules/demux/adaptative/logic/AlwaysLowestAdaptationLogic.hpp
+++ b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.hpp
@@ -22,7 +22,7 @@
 
 #include "AbstractAdaptationLogic.h"
 
-namespace adaptative
+namespace adaptive
 {
     namespace logic
     {
diff --git a/modules/demux/adaptative/logic/IDownloadRateObserver.h b/modules/demux/adaptive/logic/IDownloadRateObserver.h
similarity index 98%
rename from modules/demux/adaptative/logic/IDownloadRateObserver.h
rename to modules/demux/adaptive/logic/IDownloadRateObserver.h
index d5434ce7c4b3a1856c37642aa841d59892da717c..622c89509c1397897a0583a9d954750a84003569 100644
--- a/modules/demux/adaptative/logic/IDownloadRateObserver.h
+++ b/modules/demux/adaptive/logic/IDownloadRateObserver.h
@@ -31,7 +31,7 @@
 
 #include <vlc_common.h>
 
-namespace adaptative
+namespace adaptive
 {
     class IDownloadRateObserver
     {
diff --git a/modules/demux/adaptative/logic/RateBasedAdaptationLogic.cpp b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
similarity index 98%
rename from modules/demux/adaptative/logic/RateBasedAdaptationLogic.cpp
rename to modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
index a8940bdbfc835ce813c2eaaaba0469c4ece058d8..8645fd71f322acc3e3d7c08f1923ecf0ee300a98 100644
--- a/modules/demux/adaptative/logic/RateBasedAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
@@ -33,8 +33,8 @@
 #include "../http/Chunk.h"
 #include "../tools/Debug.hpp"
 
-using namespace adaptative::logic;
-using namespace adaptative;
+using namespace adaptive::logic;
+using namespace adaptive;
 
 RateBasedAdaptationLogic::RateBasedAdaptationLogic  (vlc_object_t *p_obj_, int w, int h) :
                           AbstractAdaptationLogic   (),
diff --git a/modules/demux/adaptative/logic/RateBasedAdaptationLogic.h b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
similarity index 99%
rename from modules/demux/adaptative/logic/RateBasedAdaptationLogic.h
rename to modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
index e2d8eb68526b2eddbc5cef7de32cdbcce5f813a3..8cd2332534573ccb0a7aa6d9fa111e9cf57d43b0 100644
--- a/modules/demux/adaptative/logic/RateBasedAdaptationLogic.h
+++ b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.h
@@ -27,7 +27,7 @@
 
 #include "AbstractAdaptationLogic.h"
 
-namespace adaptative
+namespace adaptive
 {
     namespace logic
     {
diff --git a/modules/demux/adaptative/logic/Representationselectors.cpp b/modules/demux/adaptive/logic/Representationselectors.cpp
similarity index 99%
rename from modules/demux/adaptative/logic/Representationselectors.cpp
rename to modules/demux/adaptive/logic/Representationselectors.cpp
index e260447025caddac2a4672fada7b8cb0149ca139..2730733798b92a2f6e4404830a9b3ed99bca280f 100644
--- a/modules/demux/adaptative/logic/Representationselectors.cpp
+++ b/modules/demux/adaptive/logic/Representationselectors.cpp
@@ -23,7 +23,7 @@
 #include "../playlist/BasePeriod.h"
 #include <limits>
 
-using namespace adaptative::logic;
+using namespace adaptive::logic;
 
 RepresentationSelector::RepresentationSelector()
 {
diff --git a/modules/demux/adaptative/logic/Representationselectors.hpp b/modules/demux/adaptive/logic/Representationselectors.hpp
similarity index 98%
rename from modules/demux/adaptative/logic/Representationselectors.hpp
rename to modules/demux/adaptive/logic/Representationselectors.hpp
index b39aa9be950d1f9d40e308a0543cfb57e92dcfbc..ce850324aa38067300d984ff68a36c3913fced19 100644
--- a/modules/demux/adaptative/logic/Representationselectors.hpp
+++ b/modules/demux/adaptive/logic/Representationselectors.hpp
@@ -27,7 +27,7 @@
 #include <vector>
 #include <vlc_common.h>
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/mp4/AtomsReader.cpp b/modules/demux/adaptive/mp4/AtomsReader.cpp
similarity index 98%
rename from modules/demux/adaptative/mp4/AtomsReader.cpp
rename to modules/demux/adaptive/mp4/AtomsReader.cpp
index fe84e16ee551fc703cd40acd7778ccc0f62b1669..e7d9678d410d8507dde5bfc29f7f5e626c8cf489 100644
--- a/modules/demux/adaptative/mp4/AtomsReader.cpp
+++ b/modules/demux/adaptive/mp4/AtomsReader.cpp
@@ -20,7 +20,7 @@
 #include "AtomsReader.hpp"
 #include <new>
 
-using namespace adaptative::mp4;
+using namespace adaptive::mp4;
 
 AtomsReader::AtomsReader(vlc_object_t *object_)
 {
diff --git a/modules/demux/adaptative/mp4/AtomsReader.hpp b/modules/demux/adaptive/mp4/AtomsReader.hpp
similarity index 98%
rename from modules/demux/adaptative/mp4/AtomsReader.hpp
rename to modules/demux/adaptive/mp4/AtomsReader.hpp
index 376e58ab6ef6c526626582f7c4815b45466547fa..57692e26ac35b9d3d41f75cd5834461fd5d5584c 100644
--- a/modules/demux/adaptative/mp4/AtomsReader.hpp
+++ b/modules/demux/adaptive/mp4/AtomsReader.hpp
@@ -30,7 +30,7 @@ extern "C" {
 #include "../../demux/mp4/libmp4.h"
 }
 
-namespace adaptative
+namespace adaptive
 {
     namespace mp4
     {
diff --git a/modules/demux/adaptative/playlist/AbstractPlaylist.cpp b/modules/demux/adaptive/playlist/AbstractPlaylist.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/AbstractPlaylist.cpp
rename to modules/demux/adaptive/playlist/AbstractPlaylist.cpp
index 45e136fe94dd2f009d1182734fe225fa8a48ad5a..36d20bc4641197b6706c3674645d478a0f3c0c68 100644
--- a/modules/demux/adaptative/playlist/AbstractPlaylist.cpp
+++ b/modules/demux/adaptive/playlist/AbstractPlaylist.cpp
@@ -29,7 +29,7 @@
 #include <vlc_common.h>
 #include <vlc_stream.h>
 
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
 
 AbstractPlaylist::AbstractPlaylist (stream_t *stream_) :
     ICanonicalUrl(),
diff --git a/modules/demux/adaptative/playlist/AbstractPlaylist.hpp b/modules/demux/adaptive/playlist/AbstractPlaylist.hpp
similarity index 99%
rename from modules/demux/adaptative/playlist/AbstractPlaylist.hpp
rename to modules/demux/adaptive/playlist/AbstractPlaylist.hpp
index 9e0babc0f76f15efa2a03c64e9ed56b2ce9e662b..07abef4c66122c9d6ef1c43fc27d46bf9c3c92c8 100644
--- a/modules/demux/adaptative/playlist/AbstractPlaylist.hpp
+++ b/modules/demux/adaptive/playlist/AbstractPlaylist.hpp
@@ -27,7 +27,7 @@
 #include "ICanonicalUrl.hpp"
 #include "../tools/Properties.hpp"
 
-namespace adaptative
+namespace adaptive
 {
 
     namespace playlist
diff --git a/modules/demux/adaptative/playlist/BaseAdaptationSet.cpp b/modules/demux/adaptive/playlist/BaseAdaptationSet.cpp
similarity index 97%
rename from modules/demux/adaptative/playlist/BaseAdaptationSet.cpp
rename to modules/demux/adaptive/playlist/BaseAdaptationSet.cpp
index 3471e15bd40de246053fe234919ff94e0c827871..7f7a984d2cb6b96d2766b4d6ff9287b44b59faf5 100644
--- a/modules/demux/adaptative/playlist/BaseAdaptationSet.cpp
+++ b/modules/demux/adaptive/playlist/BaseAdaptationSet.cpp
@@ -36,8 +36,8 @@
 #include "BasePeriod.h"
 #include "Inheritables.hpp"
 
-using namespace adaptative;
-using namespace adaptative::playlist;
+using namespace adaptive;
+using namespace adaptive::playlist;
 
 BaseAdaptationSet::BaseAdaptationSet(BasePeriod *period) :
     CommonAttributesElements(),
diff --git a/modules/demux/adaptative/playlist/BaseAdaptationSet.h b/modules/demux/adaptive/playlist/BaseAdaptationSet.h
similarity index 99%
rename from modules/demux/adaptative/playlist/BaseAdaptationSet.h
rename to modules/demux/adaptive/playlist/BaseAdaptationSet.h
index f2613374052413aba399dbc7d7419be636a160ff..fac1bdc6012e15a600e8ec61c28e10f2dd2b21d6 100644
--- a/modules/demux/adaptative/playlist/BaseAdaptationSet.h
+++ b/modules/demux/adaptive/playlist/BaseAdaptationSet.h
@@ -32,7 +32,7 @@
 #include "SegmentInformation.hpp"
 #include "../StreamFormat.hpp"
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/playlist/BasePeriod.cpp b/modules/demux/adaptive/playlist/BasePeriod.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/BasePeriod.cpp
rename to modules/demux/adaptive/playlist/BasePeriod.cpp
index 33f11a2c364784eaca205c50c21dae5647f52507..434bb4ab2d85b8471ffc1e46b213ee4ad39f751d 100644
--- a/modules/demux/adaptative/playlist/BasePeriod.cpp
+++ b/modules/demux/adaptive/playlist/BasePeriod.cpp
@@ -33,7 +33,7 @@
 #include <vlc_common.h>
 #include <vlc_arrays.h>
 
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
 
 BasePeriod::BasePeriod(AbstractPlaylist *playlist_) :
     SegmentInformation( playlist_ )
diff --git a/modules/demux/adaptative/playlist/BasePeriod.h b/modules/demux/adaptive/playlist/BasePeriod.h
similarity index 99%
rename from modules/demux/adaptative/playlist/BasePeriod.h
rename to modules/demux/adaptive/playlist/BasePeriod.h
index b5acf8e8c865d52dc7655e15fcaa653a17b6d1f1..6fe64f047c5ef6518603d5f9dedcc30db5018282 100644
--- a/modules/demux/adaptative/playlist/BasePeriod.h
+++ b/modules/demux/adaptive/playlist/BasePeriod.h
@@ -30,7 +30,7 @@
 #include "SegmentInformation.hpp"
 #include "../tools/Properties.hpp"
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/playlist/BaseRepresentation.cpp b/modules/demux/adaptive/playlist/BaseRepresentation.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/BaseRepresentation.cpp
rename to modules/demux/adaptive/playlist/BaseRepresentation.cpp
index 130e647966098e3842ddac07a24cfd2a7103f4e9..9823377fbc6c7dd1daedf38221cc869e43bcc15d 100644
--- a/modules/demux/adaptative/playlist/BaseRepresentation.cpp
+++ b/modules/demux/adaptive/playlist/BaseRepresentation.cpp
@@ -33,8 +33,8 @@
 #include "SegmentTimeline.h"
 #include "ID.hpp"
 
-using namespace adaptative;
-using namespace adaptative::playlist;
+using namespace adaptive;
+using namespace adaptive::playlist;
 
 BaseRepresentation::BaseRepresentation( BaseAdaptationSet *set ) :
                 SegmentInformation( set ),
diff --git a/modules/demux/adaptative/playlist/BaseRepresentation.h b/modules/demux/adaptive/playlist/BaseRepresentation.h
similarity index 99%
rename from modules/demux/adaptative/playlist/BaseRepresentation.h
rename to modules/demux/adaptive/playlist/BaseRepresentation.h
index 578fd3d259345dc9a6373d0da7a43ebd5619ab76..49a34a530c1b7592a40ab88e53988a64da142323 100644
--- a/modules/demux/adaptative/playlist/BaseRepresentation.h
+++ b/modules/demux/adaptive/playlist/BaseRepresentation.h
@@ -32,7 +32,7 @@
 #include "SegmentInformation.hpp"
 #include "../StreamFormat.hpp"
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/playlist/CommonAttributesElements.cpp b/modules/demux/adaptive/playlist/CommonAttributesElements.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/CommonAttributesElements.cpp
rename to modules/demux/adaptive/playlist/CommonAttributesElements.cpp
index ccac5aaff24549b34ec7d77c60a2ef495e296f5c..4fbfa6e1c7cd14a26a2637f4e112df0d9e9e0937 100644
--- a/modules/demux/adaptative/playlist/CommonAttributesElements.cpp
+++ b/modules/demux/adaptive/playlist/CommonAttributesElements.cpp
@@ -30,7 +30,7 @@
 #include <vlc_common.h>
 #include <vlc_arrays.h>
 
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
 
 CommonAttributesElements::CommonAttributesElements() :
     width( -1 ),
diff --git a/modules/demux/adaptative/playlist/CommonAttributesElements.h b/modules/demux/adaptive/playlist/CommonAttributesElements.h
similarity index 99%
rename from modules/demux/adaptative/playlist/CommonAttributesElements.h
rename to modules/demux/adaptive/playlist/CommonAttributesElements.h
index a20893615b78f0e46146e0257608d81adb61cab1..8ff1576b75ee9587d57b57a73ba7673c4af35d96 100644
--- a/modules/demux/adaptative/playlist/CommonAttributesElements.h
+++ b/modules/demux/adaptive/playlist/CommonAttributesElements.h
@@ -27,7 +27,7 @@
 #include <list>
 #include <string>
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/playlist/ICanonicalUrl.hpp b/modules/demux/adaptive/playlist/ICanonicalUrl.hpp
similarity index 98%
rename from modules/demux/adaptative/playlist/ICanonicalUrl.hpp
rename to modules/demux/adaptive/playlist/ICanonicalUrl.hpp
index b751248fe91860113410bd1c08e4aa419eb06d2d..a5f301b5c13d0cd669f025fcc1f7b2f5fa4e0d79 100644
--- a/modules/demux/adaptative/playlist/ICanonicalUrl.hpp
+++ b/modules/demux/adaptive/playlist/ICanonicalUrl.hpp
@@ -22,7 +22,7 @@
 
 #include "Url.hpp"
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/playlist/ID.cpp b/modules/demux/adaptive/playlist/ID.cpp
similarity index 97%
rename from modules/demux/adaptative/playlist/ID.cpp
rename to modules/demux/adaptive/playlist/ID.cpp
index a475a40b2a1971a1ef41e88e925b0b7cd4e07d3a..fae4d7d2ee65c979f2770a6632a47713119477ce 100644
--- a/modules/demux/adaptative/playlist/ID.cpp
+++ b/modules/demux/adaptive/playlist/ID.cpp
@@ -20,7 +20,7 @@
 #include "ID.hpp"
 #include <sstream>
 
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
 
 ID::ID(const std::string &id_)
 {
diff --git a/modules/demux/adaptative/playlist/ID.hpp b/modules/demux/adaptive/playlist/ID.hpp
similarity index 98%
rename from modules/demux/adaptative/playlist/ID.hpp
rename to modules/demux/adaptive/playlist/ID.hpp
index bead7abcad97d73511a01d4b15787d3f8b383e09..a6729569608a5e6544459e2fc4878e705f3bafa3 100644
--- a/modules/demux/adaptative/playlist/ID.hpp
+++ b/modules/demux/adaptive/playlist/ID.hpp
@@ -23,7 +23,7 @@
 #include <string>
 #include <inttypes.h>
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/playlist/Inheritables.cpp b/modules/demux/adaptive/playlist/Inheritables.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/Inheritables.cpp
rename to modules/demux/adaptive/playlist/Inheritables.cpp
index f497f6804b3c3056d207521922a6543046e05a4a..4f3ca3b522ee693e91a393165de8e54a993fe77f 100644
--- a/modules/demux/adaptative/playlist/Inheritables.cpp
+++ b/modules/demux/adaptive/playlist/Inheritables.cpp
@@ -25,7 +25,7 @@
 #include "Inheritables.hpp"
 #include "SegmentTimeline.h"
 
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
 
 Timelineable::Timelineable()
 {
diff --git a/modules/demux/adaptative/playlist/Inheritables.hpp b/modules/demux/adaptive/playlist/Inheritables.hpp
similarity index 99%
rename from modules/demux/adaptative/playlist/Inheritables.hpp
rename to modules/demux/adaptive/playlist/Inheritables.hpp
index 63da71656e47c5e4c67798688070dde923f3bc44..98da97c4d884fa68fefb365c02a333f1743302a2 100644
--- a/modules/demux/adaptative/playlist/Inheritables.hpp
+++ b/modules/demux/adaptive/playlist/Inheritables.hpp
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include "ID.hpp"
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/playlist/Segment.cpp b/modules/demux/adaptive/playlist/Segment.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/Segment.cpp
rename to modules/demux/adaptive/playlist/Segment.cpp
index d196d2be023ace2c15f28aff78f13527dd004ecf..d30a92a527875a39034cd3ebc5f299acc765d5f9 100644
--- a/modules/demux/adaptative/playlist/Segment.cpp
+++ b/modules/demux/adaptive/playlist/Segment.cpp
@@ -35,8 +35,8 @@
 #include "../http/Downloader.hpp"
 #include <cassert>
 
-using namespace adaptative::http;
-using namespace adaptative::playlist;
+using namespace adaptive::http;
+using namespace adaptive::playlist;
 
 const int ISegment::SEQUENCE_INVALID = 0;
 const int ISegment::SEQUENCE_FIRST   = 1;
diff --git a/modules/demux/adaptative/playlist/Segment.h b/modules/demux/adaptive/playlist/Segment.h
similarity index 99%
rename from modules/demux/adaptative/playlist/Segment.h
rename to modules/demux/adaptive/playlist/Segment.h
index 84b0fee070c63137f492e897f4fc96f64461f3f5..7e28578450e11ec90d6a2fc48d1700ca675b271c 100644
--- a/modules/demux/adaptative/playlist/Segment.h
+++ b/modules/demux/adaptive/playlist/Segment.h
@@ -33,7 +33,7 @@
 #include "../tools/Properties.hpp"
 #include "Time.hpp"
 
-namespace adaptative
+namespace adaptive
 {
     namespace http
     {
diff --git a/modules/demux/adaptative/playlist/SegmentBase.cpp b/modules/demux/adaptive/playlist/SegmentBase.cpp
similarity index 97%
rename from modules/demux/adaptative/playlist/SegmentBase.cpp
rename to modules/demux/adaptive/playlist/SegmentBase.cpp
index 573751c8778f6727e3af3338aa5c8773a5a5fdb7..0ddac8bef667e66ef9be064c1b6491b5d7135839 100644
--- a/modules/demux/adaptative/playlist/SegmentBase.cpp
+++ b/modules/demux/adaptive/playlist/SegmentBase.cpp
@@ -24,7 +24,7 @@
 
 #include "SegmentBase.h"
 
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
 
 SegmentBase::SegmentBase(ICanonicalUrl *parent) :
              Segment(parent),
diff --git a/modules/demux/adaptative/playlist/SegmentBase.h b/modules/demux/adaptive/playlist/SegmentBase.h
similarity index 98%
rename from modules/demux/adaptative/playlist/SegmentBase.h
rename to modules/demux/adaptive/playlist/SegmentBase.h
index f9c55ad3abf9e3acc18385d51c4f0c45e97417b5..3144e2cff15c143f860c7c6738002f18b0d2445e 100644
--- a/modules/demux/adaptative/playlist/SegmentBase.h
+++ b/modules/demux/adaptive/playlist/SegmentBase.h
@@ -29,7 +29,7 @@
 #include "SegmentInfoCommon.h"
 #include "../tools/Properties.hpp"
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/playlist/SegmentChunk.cpp b/modules/demux/adaptive/playlist/SegmentChunk.cpp
similarity index 96%
rename from modules/demux/adaptative/playlist/SegmentChunk.cpp
rename to modules/demux/adaptive/playlist/SegmentChunk.cpp
index 031a31a904a9b00026900f2efe27b98e93f75cce..c07939ae424eee6638ebdcfb89b79d199ad68b40 100644
--- a/modules/demux/adaptative/playlist/SegmentChunk.cpp
+++ b/modules/demux/adaptive/playlist/SegmentChunk.cpp
@@ -22,8 +22,8 @@
 #include "BaseRepresentation.h"
 #include <cassert>
 
-using namespace adaptative::playlist;
-using namespace adaptative;
+using namespace adaptive::playlist;
+using namespace adaptive;
 
 SegmentChunk::SegmentChunk(ISegment *segment_, AbstractChunkSource *source) :
     AbstractChunk(source)
diff --git a/modules/demux/adaptative/playlist/SegmentChunk.hpp b/modules/demux/adaptive/playlist/SegmentChunk.hpp
similarity index 98%
rename from modules/demux/adaptative/playlist/SegmentChunk.hpp
rename to modules/demux/adaptive/playlist/SegmentChunk.hpp
index 3711bc059f125c8ae37670301d61136c0c5ce288..81afb138a7c404728938437df2aba9e7858c5120 100644
--- a/modules/demux/adaptative/playlist/SegmentChunk.hpp
+++ b/modules/demux/adaptive/playlist/SegmentChunk.hpp
@@ -25,7 +25,7 @@
 #include "../http/Chunk.h"
 #include "../StreamFormat.hpp"
 
-namespace adaptative
+namespace adaptive
 {
 
     namespace playlist
diff --git a/modules/demux/adaptative/playlist/SegmentInfoCommon.cpp b/modules/demux/adaptive/playlist/SegmentInfoCommon.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/SegmentInfoCommon.cpp
rename to modules/demux/adaptive/playlist/SegmentInfoCommon.cpp
index 8e91b88162208adadc5f6ff32728b3895381839c..74b9124a4bda96efe502e131f3220adb9dbf601b 100644
--- a/modules/demux/adaptative/playlist/SegmentInfoCommon.cpp
+++ b/modules/demux/adaptive/playlist/SegmentInfoCommon.cpp
@@ -28,7 +28,7 @@
 
 #include "SegmentInfoCommon.h"
 
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
 
 SegmentInfoCommon::SegmentInfoCommon( ICanonicalUrl *parent ) :
     ICanonicalUrl( parent ), Initializable(), Indexable(),
diff --git a/modules/demux/adaptative/playlist/SegmentInfoCommon.h b/modules/demux/adaptive/playlist/SegmentInfoCommon.h
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentInfoCommon.h
rename to modules/demux/adaptive/playlist/SegmentInfoCommon.h
index e813a253b8dd4c3a70d5f3238fac6d281af56820..47a499f77f6f2963be03c810ac338865c026168e 100644
--- a/modules/demux/adaptative/playlist/SegmentInfoCommon.h
+++ b/modules/demux/adaptive/playlist/SegmentInfoCommon.h
@@ -33,7 +33,7 @@
 #include "ICanonicalUrl.hpp"
 #include "../tools/Properties.hpp"
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/playlist/SegmentInformation.cpp b/modules/demux/adaptive/playlist/SegmentInformation.cpp
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentInformation.cpp
rename to modules/demux/adaptive/playlist/SegmentInformation.cpp
index a07d3a07b21253e4b81c453d0a614a770cc03066..212b64772f2ca2305b2f7a28fef474c9dea59c07 100644
--- a/modules/demux/adaptative/playlist/SegmentInformation.cpp
+++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp
@@ -30,7 +30,7 @@
 #include <algorithm>
 #include <cassert>
 
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
 
 SegmentInformation::SegmentInformation(SegmentInformation *parent_) :
     ICanonicalUrl( parent_ ),
diff --git a/modules/demux/adaptative/playlist/SegmentInformation.hpp b/modules/demux/adaptive/playlist/SegmentInformation.hpp
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentInformation.hpp
rename to modules/demux/adaptive/playlist/SegmentInformation.hpp
index 38eddc35ae39a9d57ec395e0bdbdc9d6c952f0cb..7c9e9ce01297d2edc62a2ed17955ed6dd86a3e12 100644
--- a/modules/demux/adaptative/playlist/SegmentInformation.hpp
+++ b/modules/demux/adaptive/playlist/SegmentInformation.hpp
@@ -30,7 +30,7 @@
 #include <vlc_common.h>
 #include <vector>
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/playlist/SegmentList.cpp b/modules/demux/adaptive/playlist/SegmentList.cpp
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentList.cpp
rename to modules/demux/adaptive/playlist/SegmentList.cpp
index 99c96707183384851a9818c877fa3982879d7e1e..4a4d8b3600106b1c67cdd4a3913d86ba7e68e04b 100644
--- a/modules/demux/adaptative/playlist/SegmentList.cpp
+++ b/modules/demux/adaptive/playlist/SegmentList.cpp
@@ -26,7 +26,7 @@
 #include "Segment.h"
 #include "SegmentInformation.hpp"
 
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
 
 SegmentList::SegmentList( SegmentInformation *parent ):
     SegmentInfoCommon( parent ), TimescaleAble( parent )
diff --git a/modules/demux/adaptative/playlist/SegmentList.h b/modules/demux/adaptive/playlist/SegmentList.h
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentList.h
rename to modules/demux/adaptive/playlist/SegmentList.h
index 97d0f16c23dcaf41529664fddc25cfcc72567997..bb1cc76cd248dc532a3f76d244a9122e4f363853 100644
--- a/modules/demux/adaptative/playlist/SegmentList.h
+++ b/modules/demux/adaptive/playlist/SegmentList.h
@@ -31,7 +31,7 @@
 
 #include "SegmentInfoCommon.h"
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/playlist/SegmentTemplate.cpp b/modules/demux/adaptive/playlist/SegmentTemplate.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/SegmentTemplate.cpp
rename to modules/demux/adaptive/playlist/SegmentTemplate.cpp
index e3e5f9da16b17341064a6c2661c90bc1f87c95f6..0521fa4ae82d36020f79138ef4c64b1986570b09 100644
--- a/modules/demux/adaptative/playlist/SegmentTemplate.cpp
+++ b/modules/demux/adaptive/playlist/SegmentTemplate.cpp
@@ -28,7 +28,7 @@
 #include "SegmentTimeline.h"
 #include "SegmentInformation.hpp"
 
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
 
 BaseSegmentTemplate::BaseSegmentTemplate( ICanonicalUrl *parent ) :
     Segment( parent )
diff --git a/modules/demux/adaptative/playlist/SegmentTemplate.h b/modules/demux/adaptive/playlist/SegmentTemplate.h
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentTemplate.h
rename to modules/demux/adaptive/playlist/SegmentTemplate.h
index 27d35142995181cbb4931a91b1a96d69d377230f..e1958a96682807059f39932e3b803bfd69186fc6 100644
--- a/modules/demux/adaptative/playlist/SegmentTemplate.h
+++ b/modules/demux/adaptive/playlist/SegmentTemplate.h
@@ -28,7 +28,7 @@
 #include "../tools/Properties.hpp"
 #include "SegmentInfoCommon.h"
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/playlist/SegmentTimeline.cpp b/modules/demux/adaptive/playlist/SegmentTimeline.cpp
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentTimeline.cpp
rename to modules/demux/adaptive/playlist/SegmentTimeline.cpp
index f249a56f3696ca959eff80584816d8ed1435e026..aec6367ba540976d9c83f4c99f70a5c6dd44f6e3 100644
--- a/modules/demux/adaptative/playlist/SegmentTimeline.cpp
+++ b/modules/demux/adaptive/playlist/SegmentTimeline.cpp
@@ -25,7 +25,7 @@
 
 #include <algorithm>
 
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
 
 SegmentTimeline::SegmentTimeline(TimescaleAble *parent)
     :TimescaleAble(parent)
diff --git a/modules/demux/adaptative/playlist/SegmentTimeline.h b/modules/demux/adaptive/playlist/SegmentTimeline.h
similarity index 99%
rename from modules/demux/adaptative/playlist/SegmentTimeline.h
rename to modules/demux/adaptive/playlist/SegmentTimeline.h
index 46aa171bb554f4b16f137856b1c095d0d35defb5..cc06216e88de65a8678dc35bd1157ad0a300be50 100644
--- a/modules/demux/adaptative/playlist/SegmentTimeline.h
+++ b/modules/demux/adaptive/playlist/SegmentTimeline.h
@@ -32,7 +32,7 @@
 #include <vlc_common.h>
 #include <list>
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/playlist/Templates.hpp b/modules/demux/adaptive/playlist/Templates.hpp
similarity index 98%
rename from modules/demux/adaptative/playlist/Templates.hpp
rename to modules/demux/adaptive/playlist/Templates.hpp
index c5c4ddf83f8cb0260220aa89db0b6b7f5b0cc6f0..249fccafd646436fae9b19f2c16bca69576852d7 100644
--- a/modules/demux/adaptative/playlist/Templates.hpp
+++ b/modules/demux/adaptive/playlist/Templates.hpp
@@ -20,7 +20,7 @@
 #ifndef TEMPLATES_HPP
 #define TEMPLATES_HPP
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/playlist/Url.cpp b/modules/demux/adaptive/playlist/Url.cpp
similarity index 98%
rename from modules/demux/adaptative/playlist/Url.cpp
rename to modules/demux/adaptive/playlist/Url.cpp
index 78e60371954985b75b59ec39095a656af78da68f..8efedf2b130ad8bd69bdc6361bfc015b9506958c 100644
--- a/modules/demux/adaptative/playlist/Url.cpp
+++ b/modules/demux/adaptive/playlist/Url.cpp
@@ -21,7 +21,7 @@
 #include "BaseRepresentation.h"
 #include "SegmentTemplate.h"
 
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
 
 Url::Url()
 {
diff --git a/modules/demux/adaptative/playlist/Url.hpp b/modules/demux/adaptive/playlist/Url.hpp
similarity index 99%
rename from modules/demux/adaptative/playlist/Url.hpp
rename to modules/demux/adaptive/playlist/Url.hpp
index b238b7ec3f544c7803ef21a88abb9d98bb58266a..00d9fff6d15af9788ecac9a505c05503b79868e4 100644
--- a/modules/demux/adaptative/playlist/Url.hpp
+++ b/modules/demux/adaptive/playlist/Url.hpp
@@ -28,7 +28,7 @@
 #include <vector>
 #include <vlc_common.h>
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
diff --git a/modules/demux/adaptative/plumbing/CommandsQueue.cpp b/modules/demux/adaptive/plumbing/CommandsQueue.cpp
similarity index 98%
rename from modules/demux/adaptative/plumbing/CommandsQueue.cpp
rename to modules/demux/adaptive/plumbing/CommandsQueue.cpp
index 8324bc5afa918956caad1206add4eb1fb157a003..8aff7c563524388b627dfe6405d65867ad96f47c 100644
--- a/modules/demux/adaptative/plumbing/CommandsQueue.cpp
+++ b/modules/demux/adaptive/plumbing/CommandsQueue.cpp
@@ -24,7 +24,7 @@
 #include <vlc_block.h>
 #include <algorithm>
 
-using namespace adaptative;
+using namespace adaptive;
 
 enum
 {
@@ -112,7 +112,7 @@ EsOutAddCommand::~EsOutAddCommand()
 
 void EsOutAddCommand::Execute( es_out_t * )
 {
-    /* Create the real ES on the adaptative demux */
+    /* Create the real ES on the adaptive demux */
     p_fakeid->create();
 }
 
diff --git a/modules/demux/adaptative/plumbing/CommandsQueue.hpp b/modules/demux/adaptive/plumbing/CommandsQueue.hpp
similarity index 99%
rename from modules/demux/adaptative/plumbing/CommandsQueue.hpp
rename to modules/demux/adaptive/plumbing/CommandsQueue.hpp
index d28592e613e0d8625d126556f13a018e53524109..e4e9eee307752bd5523ea568574ce64afd6d8320 100644
--- a/modules/demux/adaptative/plumbing/CommandsQueue.hpp
+++ b/modules/demux/adaptive/plumbing/CommandsQueue.hpp
@@ -30,7 +30,7 @@
 
 #include <list>
 
-namespace adaptative
+namespace adaptive
 {
     class FakeESOut;
     class FakeESOutID;
diff --git a/modules/demux/adaptative/plumbing/Demuxer.cpp b/modules/demux/adaptive/plumbing/Demuxer.cpp
similarity index 99%
rename from modules/demux/adaptative/plumbing/Demuxer.cpp
rename to modules/demux/adaptive/plumbing/Demuxer.cpp
index 9d9807512514cae8ffd0f2760e671703d2c494ad..d60f726555f0627fd8f3b0da3fdbaf4ebb154a0f 100644
--- a/modules/demux/adaptative/plumbing/Demuxer.cpp
+++ b/modules/demux/adaptive/plumbing/Demuxer.cpp
@@ -25,7 +25,7 @@
 #include "CommandsQueue.hpp"
 #include "../ChunksSource.hpp"
 
-using namespace adaptative;
+using namespace adaptive;
 
 AbstractDemuxer::AbstractDemuxer()
 {
diff --git a/modules/demux/adaptative/plumbing/Demuxer.hpp b/modules/demux/adaptive/plumbing/Demuxer.hpp
similarity index 99%
rename from modules/demux/adaptative/plumbing/Demuxer.hpp
rename to modules/demux/adaptive/plumbing/Demuxer.hpp
index e45798773c187bb1eda8934b174c9ca0e7b044ac..d33bee00444d09a8c7152b74abcf0ec33741c659 100644
--- a/modules/demux/adaptative/plumbing/Demuxer.hpp
+++ b/modules/demux/adaptive/plumbing/Demuxer.hpp
@@ -27,7 +27,7 @@
 #include <vlc_common.h>
 #include <string>
 
-namespace adaptative
+namespace adaptive
 {
     class CommandsQueue;
     class AbstractSourceStream;
diff --git a/modules/demux/adaptative/plumbing/FakeESOut.cpp b/modules/demux/adaptive/plumbing/FakeESOut.cpp
similarity index 99%
rename from modules/demux/adaptative/plumbing/FakeESOut.cpp
rename to modules/demux/adaptive/plumbing/FakeESOut.cpp
index bd465071625fb95ca85ecce256a069ca9eb40eff..71589800a5b560dd19dad429dbb0498ab1364667 100644
--- a/modules/demux/adaptative/plumbing/FakeESOut.cpp
+++ b/modules/demux/adaptive/plumbing/FakeESOut.cpp
@@ -23,7 +23,7 @@
 #include <vlc_block.h>
 #include <cassert>
 
-using namespace adaptative;
+using namespace adaptive;
 
 FakeESOut::FakeESOut( es_out_t *es, CommandsFactory *factory )
 {
@@ -72,7 +72,7 @@ FakeESOutID * FakeESOut::createNewID( const es_format_t *p_fmt )
     es_format_t fmtcopy;
     es_format_Init( &fmtcopy, 0, 0 );
     es_format_Copy( &fmtcopy, p_fmt );
-    fmtcopy.i_group = 0; /* Always ignore group for adaptative */
+    fmtcopy.i_group = 0; /* Always ignore group for adaptive */
 
     if( extrainfo )
         extrainfo->fillExtraFMTInfo( &fmtcopy );
diff --git a/modules/demux/adaptative/plumbing/FakeESOut.hpp b/modules/demux/adaptive/plumbing/FakeESOut.hpp
similarity index 99%
rename from modules/demux/adaptative/plumbing/FakeESOut.hpp
rename to modules/demux/adaptive/plumbing/FakeESOut.hpp
index 9e0c259c30d8c0d9d05cc74d5a268f4de8e5cd3a..d352cdee7b7ffe5abca60a4b5edf3e431c7f2356 100644
--- a/modules/demux/adaptative/plumbing/FakeESOut.hpp
+++ b/modules/demux/adaptive/plumbing/FakeESOut.hpp
@@ -27,7 +27,7 @@
 #include "CommandsQueue.hpp"
 #include <vlc_atomic.h>
 
-namespace adaptative
+namespace adaptive
 {
     class ExtraFMTInfoInterface
     {
diff --git a/modules/demux/adaptative/plumbing/FakeESOutID.cpp b/modules/demux/adaptive/plumbing/FakeESOutID.cpp
similarity index 98%
rename from modules/demux/adaptative/plumbing/FakeESOutID.cpp
rename to modules/demux/adaptive/plumbing/FakeESOutID.cpp
index ec2313ec2e97e949f0e32ecc6e8a7ebb26fa134b..2088eafed14a4f11396ccd2f3c6dc00546c76462 100644
--- a/modules/demux/adaptative/plumbing/FakeESOutID.cpp
+++ b/modules/demux/adaptive/plumbing/FakeESOutID.cpp
@@ -20,7 +20,7 @@
 #include "FakeESOutID.hpp"
 #include "FakeESOut.hpp"
 
-using namespace adaptative;
+using namespace adaptive;
 
 FakeESOutID::FakeESOutID( FakeESOut *fakeesout_, const es_format_t *p_fmt )
 {
diff --git a/modules/demux/adaptative/plumbing/FakeESOutID.hpp b/modules/demux/adaptive/plumbing/FakeESOutID.hpp
similarity index 98%
rename from modules/demux/adaptative/plumbing/FakeESOutID.hpp
rename to modules/demux/adaptive/plumbing/FakeESOutID.hpp
index b8f4b9e9e5c2194fb5a30f6185792ff7d0f87710..dc1477b25dd8f115fab8f11fa2bdd6dbc4a7ea7a 100644
--- a/modules/demux/adaptative/plumbing/FakeESOutID.hpp
+++ b/modules/demux/adaptive/plumbing/FakeESOutID.hpp
@@ -27,7 +27,7 @@
 #include <vlc_common.h>
 #include <vlc_es.h>
 
-namespace adaptative
+namespace adaptive
 {
     class FakeESOut;
 
diff --git a/modules/demux/adaptative/plumbing/SourceStream.cpp b/modules/demux/adaptive/plumbing/SourceStream.cpp
similarity index 99%
rename from modules/demux/adaptative/plumbing/SourceStream.cpp
rename to modules/demux/adaptive/plumbing/SourceStream.cpp
index 70e32374de13796aa72da62a87b9e68b8c7c4eb7..8bc1f9e8212e7392de679d2b282f6d2d71af44b6 100644
--- a/modules/demux/adaptative/plumbing/SourceStream.cpp
+++ b/modules/demux/adaptive/plumbing/SourceStream.cpp
@@ -24,7 +24,7 @@
 #include <vlc_stream.h>
 #include <vlc_demux.h>
 
-using namespace adaptative;
+using namespace adaptive;
 
 ChunksSourceStream::ChunksSourceStream(vlc_object_t *p_obj, ChunksSource *source_)
 {
diff --git a/modules/demux/adaptative/plumbing/SourceStream.hpp b/modules/demux/adaptive/plumbing/SourceStream.hpp
similarity index 99%
rename from modules/demux/adaptative/plumbing/SourceStream.hpp
rename to modules/demux/adaptive/plumbing/SourceStream.hpp
index 275c605c8ee3f8d7dfe7be8835ada4141d9af9ae..beeb95abaa6cfb203cc5e825a83483547a47734c 100644
--- a/modules/demux/adaptative/plumbing/SourceStream.hpp
+++ b/modules/demux/adaptive/plumbing/SourceStream.hpp
@@ -27,7 +27,7 @@
 #include <vlc_common.h>
 #include <vlc_block.h>
 
-namespace adaptative
+namespace adaptive
 {
     class ChunksSource;
 
diff --git a/modules/demux/adaptative/tools/Conversions.cpp b/modules/demux/adaptive/tools/Conversions.cpp
similarity index 100%
rename from modules/demux/adaptative/tools/Conversions.cpp
rename to modules/demux/adaptive/tools/Conversions.cpp
diff --git a/modules/demux/adaptative/tools/Conversions.hpp b/modules/demux/adaptive/tools/Conversions.hpp
similarity index 100%
rename from modules/demux/adaptative/tools/Conversions.hpp
rename to modules/demux/adaptive/tools/Conversions.hpp
diff --git a/modules/demux/adaptative/tools/Debug.hpp b/modules/demux/adaptive/tools/Debug.hpp
similarity index 100%
rename from modules/demux/adaptative/tools/Debug.hpp
rename to modules/demux/adaptive/tools/Debug.hpp
diff --git a/modules/demux/adaptative/tools/Helper.cpp b/modules/demux/adaptive/tools/Helper.cpp
similarity index 98%
rename from modules/demux/adaptative/tools/Helper.cpp
rename to modules/demux/adaptive/tools/Helper.cpp
index 435df4cf46d5c3e1cc298bf2286e53465c438415..be5e1227f75bf2d4045309a85c4261d81063bf4b 100644
--- a/modules/demux/adaptative/tools/Helper.cpp
+++ b/modules/demux/adaptive/tools/Helper.cpp
@@ -27,7 +27,7 @@
 
 #include "Helper.h"
 #include <algorithm>
-using namespace adaptative;
+using namespace adaptive;
 
 std::string Helper::combinePaths        (const std::string &path1, const std::string &path2)
 {
diff --git a/modules/demux/adaptative/tools/Helper.h b/modules/demux/adaptive/tools/Helper.h
similarity index 98%
rename from modules/demux/adaptative/tools/Helper.h
rename to modules/demux/adaptive/tools/Helper.h
index 24a6e927d5f6f54b6c9a9c63583cda0ab0b4623f..8272887ee8c312ca5429a6891c021f407a0ccdda 100644
--- a/modules/demux/adaptative/tools/Helper.h
+++ b/modules/demux/adaptive/tools/Helper.h
@@ -28,7 +28,7 @@
 #include <string>
 #include <list>
 
-namespace adaptative
+namespace adaptive
 {
     class Helper
     {
diff --git a/modules/demux/adaptative/tools/Properties.hpp b/modules/demux/adaptive/tools/Properties.hpp
similarity index 100%
rename from modules/demux/adaptative/tools/Properties.hpp
rename to modules/demux/adaptive/tools/Properties.hpp
diff --git a/modules/demux/adaptative/tools/Retrieve.cpp b/modules/demux/adaptive/tools/Retrieve.cpp
similarity index 95%
rename from modules/demux/adaptative/tools/Retrieve.cpp
rename to modules/demux/adaptive/tools/Retrieve.cpp
index d1cb7bf41bd3df517b2fd3c1e613be065c62be43..6556948d45da0eee5f2a0a0426431951bba44e6a 100644
--- a/modules/demux/adaptative/tools/Retrieve.cpp
+++ b/modules/demux/adaptive/tools/Retrieve.cpp
@@ -23,8 +23,8 @@
 #include "../http/HTTPConnection.hpp"
 #include "../http/Chunk.h"
 
-using namespace adaptative;
-using namespace adaptative::http;
+using namespace adaptive;
+using namespace adaptive::http;
 
 block_t * Retrieve::HTTP(vlc_object_t *obj, const std::string &uri)
 {
diff --git a/modules/demux/adaptative/tools/Retrieve.hpp b/modules/demux/adaptive/tools/Retrieve.hpp
similarity index 98%
rename from modules/demux/adaptative/tools/Retrieve.hpp
rename to modules/demux/adaptive/tools/Retrieve.hpp
index 26d3e7fa1f8f7e66cb16c02508e4ca18ea64fc37..b67827d5e87d3259fcaea9a2a8b29a344173afbe 100644
--- a/modules/demux/adaptative/tools/Retrieve.hpp
+++ b/modules/demux/adaptive/tools/Retrieve.hpp
@@ -27,7 +27,7 @@
 #include <vlc_common.h>
 #include <string>
 
-namespace adaptative
+namespace adaptive
 {
     class Retrieve
     {
diff --git a/modules/demux/adaptative/xml/DOMHelper.cpp b/modules/demux/adaptive/xml/DOMHelper.cpp
similarity index 98%
rename from modules/demux/adaptative/xml/DOMHelper.cpp
rename to modules/demux/adaptive/xml/DOMHelper.cpp
index f993f0790ea531058aee0613dea4bc066bb640cd..7b9209930891c7f457b989a9ac060fa59b2df9e2 100644
--- a/modules/demux/adaptative/xml/DOMHelper.cpp
+++ b/modules/demux/adaptive/xml/DOMHelper.cpp
@@ -27,7 +27,7 @@
 
 #include "DOMHelper.h"
 
-using namespace adaptative::xml;
+using namespace adaptive::xml;
 
 std::vector<Node *> DOMHelper::getElementByTagName      (Node *root, const std::string& name, bool selfContain)
 {
diff --git a/modules/demux/adaptative/xml/DOMHelper.h b/modules/demux/adaptive/xml/DOMHelper.h
similarity index 98%
rename from modules/demux/adaptative/xml/DOMHelper.h
rename to modules/demux/adaptive/xml/DOMHelper.h
index 3f2901d48b7c9d453002f3062929839d47a101f5..9c71ded9b7f437983bf3607f392f58ccb069f24b 100644
--- a/modules/demux/adaptative/xml/DOMHelper.h
+++ b/modules/demux/adaptive/xml/DOMHelper.h
@@ -30,7 +30,7 @@
 
 #include "Node.h"
 
-namespace adaptative
+namespace adaptive
 {
     namespace xml
     {
diff --git a/modules/demux/adaptative/xml/DOMParser.cpp b/modules/demux/adaptive/xml/DOMParser.cpp
similarity index 99%
rename from modules/demux/adaptative/xml/DOMParser.cpp
rename to modules/demux/adaptive/xml/DOMParser.cpp
index 51a45e49becf16ff6bbbdb9fd3f42db880f33163..9534c6774acf42c5c38fb326ba30c07eb538d6da 100644
--- a/modules/demux/adaptative/xml/DOMParser.cpp
+++ b/modules/demux/adaptive/xml/DOMParser.cpp
@@ -31,7 +31,7 @@
 #include <stack>
 #include <vlc_xml.h>
 
-using namespace adaptative::xml;
+using namespace adaptive::xml;
 
 DOMParser::DOMParser() :
     root( NULL ),
diff --git a/modules/demux/adaptative/xml/DOMParser.h b/modules/demux/adaptive/xml/DOMParser.h
similarity index 99%
rename from modules/demux/adaptative/xml/DOMParser.h
rename to modules/demux/adaptive/xml/DOMParser.h
index 49d96dafff381baad4d566a0c1b474552bd52754..31e3a3f5f22bb6f5c8f74bd2ada11fe4bade52a2 100644
--- a/modules/demux/adaptative/xml/DOMParser.h
+++ b/modules/demux/adaptive/xml/DOMParser.h
@@ -34,7 +34,7 @@
 
 #include "Node.h"
 
-namespace adaptative
+namespace adaptive
 {
     namespace xml
     {
diff --git a/modules/demux/adaptative/xml/Node.cpp b/modules/demux/adaptive/xml/Node.cpp
similarity index 99%
rename from modules/demux/adaptative/xml/Node.cpp
rename to modules/demux/adaptive/xml/Node.cpp
index 12b8c2823a19df3130abac258c1eccb160d905ff..1d9cf0e58577a9fc29c6dea81139159ddc8d62a4 100644
--- a/modules/demux/adaptative/xml/Node.cpp
+++ b/modules/demux/adaptive/xml/Node.cpp
@@ -31,7 +31,7 @@
 #include <vlc_common.h>
 #include <vlc_xml.h>
 
-using namespace adaptative::xml;
+using namespace adaptive::xml;
 
 const std::string   Node::EmptyString = "";
 
diff --git a/modules/demux/adaptative/xml/Node.h b/modules/demux/adaptive/xml/Node.h
similarity index 99%
rename from modules/demux/adaptative/xml/Node.h
rename to modules/demux/adaptive/xml/Node.h
index b938850c7f3f9f74068f4e0df1aae0ec14b9de12..d40b8875d8a1f86b851527fe71310b77f41ae7a3 100644
--- a/modules/demux/adaptative/xml/Node.h
+++ b/modules/demux/adaptive/xml/Node.h
@@ -29,7 +29,7 @@
 #include <string>
 #include <map>
 
-namespace adaptative
+namespace adaptive
 {
     namespace xml
     {
diff --git a/modules/demux/dash/DASHManager.cpp b/modules/demux/dash/DASHManager.cpp
index d9ea3bfa770384f900085311a6148123888eb2e9..4c1a7e453b69ceb504f9da9d62cb7e5e48644e7d 100644
--- a/modules/demux/dash/DASHManager.cpp
+++ b/modules/demux/dash/DASHManager.cpp
@@ -33,20 +33,20 @@
 #include "mpd/IsoffMainParser.h"
 #include "xml/DOMParser.h"
 #include "xml/Node.h"
-#include "../adaptative/tools/Helper.h"
-#include "../adaptative/http/HTTPConnectionManager.h"
+#include "../adaptive/tools/Helper.h"
+#include "../adaptive/http/HTTPConnectionManager.h"
 #include <vlc_stream.h>
 #include <vlc_demux.h>
 #include <vlc_meta.h>
 #include <vlc_block.h>
-#include "../adaptative/tools/Retrieve.hpp"
+#include "../adaptive/tools/Retrieve.hpp"
 
 #include <algorithm>
 #include <ctime>
 
 using namespace dash;
 using namespace dash::mpd;
-using namespace adaptative::logic;
+using namespace adaptive::logic;
 
 DASHManager::DASHManager(demux_t *demux_, MPD *mpd,
                          AbstractStreamFactory *factory,
@@ -200,7 +200,7 @@ bool DASHManager::isDASH(xml::Node *root)
     std::string ns = root->getAttributeValue("xmlns");
     for( size_t i=0; i<ARRAY_SIZE(namespaces); i++ )
     {
-        if ( adaptative::Helper::ifind(ns, namespaces[i]) )
+        if ( adaptive::Helper::ifind(ns, namespaces[i]) )
             return true;
     }
     return false;
diff --git a/modules/demux/dash/DASHManager.h b/modules/demux/dash/DASHManager.h
index fbed43810e57b952a8b5e681699db5b673fe0028..8aa5bf5e82bf9a54e278bbcdac820b353ac116ed 100644
--- a/modules/demux/dash/DASHManager.h
+++ b/modules/demux/dash/DASHManager.h
@@ -25,11 +25,11 @@
 #ifndef DASHMANAGER_H_
 #define DASHMANAGER_H_
 
-#include "../adaptative/PlaylistManager.h"
-#include "../adaptative/logic/AbstractAdaptationLogic.h"
+#include "../adaptive/PlaylistManager.h"
+#include "../adaptive/logic/AbstractAdaptationLogic.h"
 #include "mpd/MPD.h"
 
-namespace adaptative
+namespace adaptive
 {
     namespace xml
     {
@@ -39,7 +39,7 @@ namespace adaptative
 
 namespace dash
 {
-    using namespace adaptative;
+    using namespace adaptive;
 
     class DASHManager : public PlaylistManager
     {
diff --git a/modules/demux/dash/DASHStream.hpp b/modules/demux/dash/DASHStream.hpp
index 16c7d203883d63d84a27c44ba619a22cee501f35..876c83e840d3d12fbc1c559a67b91789a04868ea 100644
--- a/modules/demux/dash/DASHStream.hpp
+++ b/modules/demux/dash/DASHStream.hpp
@@ -24,11 +24,11 @@
 # include "config.h"
 #endif
 
-#include "../adaptative/Streams.hpp"
+#include "../adaptive/Streams.hpp"
 
 namespace dash
 {
-    using namespace adaptative;
+    using namespace adaptive;
 
     class DASHStream : public AbstractStream
     {
diff --git a/modules/demux/dash/mp4/IndexReader.cpp b/modules/demux/dash/mp4/IndexReader.cpp
index e691d9ccca3f12f17487f16eafe8b9db8b09d428..7d8c62b1725ca6a338718750edddf5a63a613e09 100644
--- a/modules/demux/dash/mp4/IndexReader.cpp
+++ b/modules/demux/dash/mp4/IndexReader.cpp
@@ -21,7 +21,7 @@
 #include "../mpd/Representation.h"
 #include "../mpd/MPD.h"
 
-using namespace adaptative::mp4;
+using namespace adaptive::mp4;
 using namespace dash::mp4;
 using namespace dash::mpd;
 
diff --git a/modules/demux/dash/mp4/IndexReader.hpp b/modules/demux/dash/mp4/IndexReader.hpp
index 217805743ef72515f94337e3e36ddb10563c16d1..dcaf12a1f0b05fc9fe2cfca431d9abda649ba9c7 100644
--- a/modules/demux/dash/mp4/IndexReader.hpp
+++ b/modules/demux/dash/mp4/IndexReader.hpp
@@ -20,9 +20,9 @@
 #ifndef INDEXREADER_HPP
 #define INDEXREADER_HPP
 
-#include "../adaptative/mp4/AtomsReader.hpp"
+#include "../adaptive/mp4/AtomsReader.hpp"
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
@@ -34,8 +34,8 @@ namespace dash
 {
     namespace mp4
     {
-        using namespace adaptative::mp4;
-        using namespace adaptative::playlist;
+        using namespace adaptive::mp4;
+        using namespace adaptive::playlist;
 
         class IndexReader : public AtomsReader
         {
diff --git a/modules/demux/dash/mpd/AdaptationSet.cpp b/modules/demux/dash/mpd/AdaptationSet.cpp
index 1417d747519f098be839f5139a6fd03c0409697a..9e6f8276f8e1f54d4d410032a1b862869e75503a 100644
--- a/modules/demux/dash/mpd/AdaptationSet.cpp
+++ b/modules/demux/dash/mpd/AdaptationSet.cpp
@@ -30,7 +30,7 @@
 using namespace dash::mpd;
 
 AdaptationSet::AdaptationSet(Period *period) :
-    adaptative::playlist::BaseAdaptationSet( period ),
+    adaptive::playlist::BaseAdaptationSet( period ),
     DASHCommonAttributesElements(),
     subsegmentAlignmentFlag( false )
 {
diff --git a/modules/demux/dash/mpd/AdaptationSet.h b/modules/demux/dash/mpd/AdaptationSet.h
index abf056369b3023c3daaa9ff68aa1bc6f6e385e54..e48d6f1f0c8ec253a5514fb7ebd88f31a01928b7 100644
--- a/modules/demux/dash/mpd/AdaptationSet.h
+++ b/modules/demux/dash/mpd/AdaptationSet.h
@@ -29,7 +29,7 @@
 #include <string>
 #include <map>
 
-#include "../adaptative/playlist/BaseAdaptationSet.h"
+#include "../adaptive/playlist/BaseAdaptationSet.h"
 #include "DASHCommonAttributesElements.h"
 
 namespace dash
@@ -39,9 +39,9 @@ namespace dash
         class Period;
         class Representation;
 
-        using namespace adaptative;
+        using namespace adaptive;
 
-        class AdaptationSet : public adaptative::playlist::BaseAdaptationSet,
+        class AdaptationSet : public adaptive::playlist::BaseAdaptationSet,
                               public DASHCommonAttributesElements
         {
             public:
diff --git a/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp b/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp
index 0973f049fcf1d16a0fc70fd7d0127317bba4f880..62feae01bdc1ffcb72c7901f7d9937037bdd72e0 100644
--- a/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp
+++ b/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp
@@ -28,13 +28,13 @@
 #include "DASHCommonAttributesElements.h"
 
 #include "ContentDescription.h"
-#include "../adaptative/StreamFormat.hpp"
+#include "../adaptive/StreamFormat.hpp"
 
 #include <vlc_common.h>
 #include <vlc_arrays.h>
 
 using namespace dash::mpd;
-using namespace adaptative;
+using namespace adaptive;
 
 DASHCommonAttributesElements::DASHCommonAttributesElements() :
     parX( 1 ),
diff --git a/modules/demux/dash/mpd/DASHSegment.cpp b/modules/demux/dash/mpd/DASHSegment.cpp
index f96428c10d448e088f26797d8cad8e3995011268..3bdeaf2fb3ec9ca9afb842441383bb29c6898c9c 100644
--- a/modules/demux/dash/mpd/DASHSegment.cpp
+++ b/modules/demux/dash/mpd/DASHSegment.cpp
@@ -27,12 +27,12 @@
 #endif
 
 #include "DASHSegment.h"
-#include "../adaptative/playlist/BaseRepresentation.h"
+#include "../adaptive/playlist/BaseRepresentation.h"
 #include "../mp4/IndexReader.hpp"
-#include "../adaptative/playlist/AbstractPlaylist.hpp"
-#include "../adaptative/playlist/SegmentChunk.hpp"
+#include "../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../adaptive/playlist/SegmentChunk.hpp"
 
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
 using namespace dash::mpd;
 using namespace dash::mp4;
 
diff --git a/modules/demux/dash/mpd/DASHSegment.h b/modules/demux/dash/mpd/DASHSegment.h
index d5affb0630e6c8dca5272f5c6738812dcfcd5f0b..70a2d21aed7824b776897fca1dfdd772676cff83 100644
--- a/modules/demux/dash/mpd/DASHSegment.h
+++ b/modules/demux/dash/mpd/DASHSegment.h
@@ -25,14 +25,14 @@
 #ifndef DASHSEGMENT_H_
 #define DASHSEGMENT_H_
 
-#include "../adaptative/playlist/Segment.h"
+#include "../adaptive/playlist/Segment.h"
 
 namespace dash
 {
     namespace mpd
     {
-        using namespace adaptative::playlist;
-        using namespace adaptative::http;
+        using namespace adaptive::playlist;
+        using namespace adaptive::http;
 
         class DashIndexSegment : public IndexSegment
         {
diff --git a/modules/demux/dash/mpd/IsoffMainParser.cpp b/modules/demux/dash/mpd/IsoffMainParser.cpp
index a95fe627aa8d2505fcf5ddb02f7edd8c903c1855..b8ce90799af0ad87746f10fb0944d9b27c38063c 100644
--- a/modules/demux/dash/mpd/IsoffMainParser.cpp
+++ b/modules/demux/dash/mpd/IsoffMainParser.cpp
@@ -27,28 +27,28 @@
 #endif
 
 #include "IsoffMainParser.h"
-#include "../adaptative/playlist/SegmentTemplate.h"
-#include "../adaptative/playlist/Segment.h"
-#include "../adaptative/playlist/SegmentBase.h"
-#include "../adaptative/playlist/SegmentList.h"
-#include "../adaptative/playlist/SegmentTimeline.h"
-#include "../adaptative/playlist/SegmentInformation.hpp"
+#include "../adaptive/playlist/SegmentTemplate.h"
+#include "../adaptive/playlist/Segment.h"
+#include "../adaptive/playlist/SegmentBase.h"
+#include "../adaptive/playlist/SegmentList.h"
+#include "../adaptive/playlist/SegmentTimeline.h"
+#include "../adaptive/playlist/SegmentInformation.hpp"
 #include "MPD.h"
 #include "Representation.h"
 #include "Period.h"
 #include "AdaptationSet.h"
 #include "ProgramInformation.h"
 #include "DASHSegment.h"
-#include "../adaptative/xml/DOMHelper.h"
-#include "../adaptative/tools/Helper.h"
-#include "../adaptative/tools/Debug.hpp"
-#include "../adaptative/tools/Conversions.hpp"
+#include "../adaptive/xml/DOMHelper.h"
+#include "../adaptive/tools/Helper.h"
+#include "../adaptive/tools/Debug.hpp"
+#include "../adaptive/tools/Conversions.hpp"
 #include <vlc_stream.h>
 #include <cstdio>
 
 using namespace dash::mpd;
-using namespace adaptative::xml;
-using namespace adaptative::playlist;
+using namespace adaptive::xml;
+using namespace adaptive::playlist;
 
 IsoffMainParser::IsoffMainParser    (Node *root_, stream_t *stream, const std::string & streambaseurl_)
 {
diff --git a/modules/demux/dash/mpd/IsoffMainParser.h b/modules/demux/dash/mpd/IsoffMainParser.h
index 2c3d1c0ff0d5ef78da40eb8992fa4b05ce6fae2f..0cbb1edda5c914b4b78237b8a5401608906b45a9 100644
--- a/modules/demux/dash/mpd/IsoffMainParser.h
+++ b/modules/demux/dash/mpd/IsoffMainParser.h
@@ -29,14 +29,14 @@
 # include "config.h"
 #endif
 
-#include "../adaptative/playlist/SegmentInfoCommon.h"
+#include "../adaptive/playlist/SegmentInfoCommon.h"
 #include "Profile.hpp"
 
 #include <cstdlib>
 
 #include <vlc_common.h>
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
@@ -57,8 +57,8 @@ namespace dash
         class AdaptationSet;
         class MPD;
 
-        using namespace adaptative::playlist;
-        using namespace adaptative;
+        using namespace adaptive::playlist;
+        using namespace adaptive;
 
         class IsoffMainParser
         {
diff --git a/modules/demux/dash/mpd/MPD.h b/modules/demux/dash/mpd/MPD.h
index 2d305e4fe821e764456e2b8c980e6880db7af9b4..348101e55c00e2de022923d7c4656f0e92ec14a4 100644
--- a/modules/demux/dash/mpd/MPD.h
+++ b/modules/demux/dash/mpd/MPD.h
@@ -25,16 +25,16 @@
 #ifndef MPD_H_
 #define MPD_H_
 
-#include "../adaptative/playlist/AbstractPlaylist.hpp"
-#include "../adaptative/StreamFormat.hpp"
+#include "../adaptive/playlist/AbstractPlaylist.hpp"
+#include "../adaptive/StreamFormat.hpp"
 #include "Profile.hpp"
 
 namespace dash
 {
     namespace mpd
     {
-        using namespace adaptative::playlist;
-        using namespace adaptative;
+        using namespace adaptive::playlist;
+        using namespace adaptive;
 
         class ProgramInformation;
 
diff --git a/modules/demux/dash/mpd/Period.h b/modules/demux/dash/mpd/Period.h
index 27ae34e685d9e7c9d11f03d65bc4337db2cdb78e..585cd2b4ce51d4f8c07688129c6c822da4d54417 100644
--- a/modules/demux/dash/mpd/Period.h
+++ b/modules/demux/dash/mpd/Period.h
@@ -24,16 +24,16 @@
 #ifndef PERIOD_H_
 #define PERIOD_H_
 
-#include "../adaptative/playlist/BasePeriod.h"
-#include "../adaptative/playlist/SegmentInformation.hpp"
+#include "../adaptive/playlist/BasePeriod.h"
+#include "../adaptive/playlist/SegmentInformation.hpp"
 
 namespace dash
 {
     namespace mpd
     {
         class MPD;
-        using namespace adaptative;
-        using namespace adaptative::playlist;
+        using namespace adaptive;
+        using namespace adaptive::playlist;
 
         class Period : public BasePeriod
         {
diff --git a/modules/demux/dash/mpd/Representation.cpp b/modules/demux/dash/mpd/Representation.cpp
index ff5f5e5d79479e3d124d96320d286a77c4cab155..cffcf0d7f11466ecca45be9b31b8bf2008c1e330 100644
--- a/modules/demux/dash/mpd/Representation.cpp
+++ b/modules/demux/dash/mpd/Representation.cpp
@@ -31,8 +31,8 @@
 #include "AdaptationSet.h"
 #include "MPD.h"
 #include "TrickModeType.h"
-#include "../adaptative/playlist/SegmentTemplate.h"
-#include "../adaptative/playlist/SegmentTimeline.h"
+#include "../adaptive/playlist/SegmentTemplate.h"
+#include "../adaptive/playlist/SegmentTimeline.h"
 
 using namespace dash::mpd;
 
diff --git a/modules/demux/dash/mpd/Representation.h b/modules/demux/dash/mpd/Representation.h
index 43febb83f033b802708f17add878b4714ad5c73e..f02cc2cbe0cc2dc25fde4ea6a633fa4b0f466732 100644
--- a/modules/demux/dash/mpd/Representation.h
+++ b/modules/demux/dash/mpd/Representation.h
@@ -26,8 +26,8 @@
 #define DASHREPRESENTATION_H_
 
 #include "DASHCommonAttributesElements.h"
-#include "../adaptative/playlist/SegmentInfoCommon.h"
-#include "../adaptative/playlist/BaseRepresentation.h"
+#include "../adaptive/playlist/SegmentInfoCommon.h"
+#include "../adaptive/playlist/BaseRepresentation.h"
 
 namespace dash
 {
@@ -37,8 +37,8 @@ namespace dash
         class TrickModeType;
         class MPD;
 
-        using namespace adaptative;
-        using namespace adaptative::playlist;
+        using namespace adaptive;
+        using namespace adaptive::playlist;
 
         class Representation : public BaseRepresentation,
                                public DASHCommonAttributesElements
diff --git a/modules/demux/hls/HLSManager.cpp b/modules/demux/hls/HLSManager.cpp
index 3802b46d6d6f2d8a3fd5cd09cac637e6eba59040..75ffbd9b1e4eb9367a586bbc50937f86a2900836 100644
--- a/modules/demux/hls/HLSManager.cpp
+++ b/modules/demux/hls/HLSManager.cpp
@@ -23,15 +23,15 @@
 #endif
 
 #include "HLSManager.hpp"
-#include "../adaptative/tools/Retrieve.hpp"
-#include "../adaptative/http/HTTPConnectionManager.h"
+#include "../adaptive/tools/Retrieve.hpp"
+#include "../adaptive/http/HTTPConnectionManager.h"
 #include "playlist/Parser.hpp"
 #include <vlc_stream.h>
 #include <vlc_demux.h>
 #include <time.h>
 
-using namespace adaptative;
-using namespace adaptative::logic;
+using namespace adaptive;
+using namespace adaptive::logic;
 using namespace hls;
 using namespace hls::playlist;
 
diff --git a/modules/demux/hls/HLSManager.hpp b/modules/demux/hls/HLSManager.hpp
index cec3dde32c199e23593e186b63580f72790a3983..43a5c5bd1af7d21dd88cb016c8e402f5364628e5 100644
--- a/modules/demux/hls/HLSManager.hpp
+++ b/modules/demux/hls/HLSManager.hpp
@@ -20,13 +20,13 @@
 #ifndef HLSMANAGER_HPP
 #define HLSMANAGER_HPP
 
-#include "../adaptative/PlaylistManager.h"
-#include "../adaptative/logic/AbstractAdaptationLogic.h"
+#include "../adaptive/PlaylistManager.h"
+#include "../adaptive/logic/AbstractAdaptationLogic.h"
 #include "playlist/M3U8.hpp"
 
 namespace hls
 {
-    using namespace adaptative;
+    using namespace adaptive;
 
     class HLSManager : public PlaylistManager
     {
diff --git a/modules/demux/hls/HLSStreams.hpp b/modules/demux/hls/HLSStreams.hpp
index 58d94c1259b8d58c43d5a5b84ebebe4f910dc159..2366d167dca36b25af827b7d7e97aef370636d3d 100644
--- a/modules/demux/hls/HLSStreams.hpp
+++ b/modules/demux/hls/HLSStreams.hpp
@@ -24,11 +24,11 @@
 # include "config.h"
 #endif
 
-#include "../adaptative/Streams.hpp"
+#include "../adaptive/Streams.hpp"
 
 namespace hls
 {
-    using namespace adaptative;
+    using namespace adaptive;
 
     class HLSStream : public AbstractStream
     {
diff --git a/modules/demux/hls/playlist/HLSSegment.cpp b/modules/demux/hls/playlist/HLSSegment.cpp
index a9d4b5dc97f260eeda0fe743596aa53fb1dd9d4f..c17675c33f6cdd0451a948b4558e1e2ec3a4810a 100644
--- a/modules/demux/hls/playlist/HLSSegment.cpp
+++ b/modules/demux/hls/playlist/HLSSegment.cpp
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #include "HLSSegment.hpp"
-#include "../adaptative/playlist/SegmentChunk.hpp"
-#include "../adaptative/playlist/BaseRepresentation.h"
+#include "../adaptive/playlist/SegmentChunk.hpp"
+#include "../adaptive/playlist/BaseRepresentation.h"
 
 #include <vlc_common.h>
 #include <vlc_block.h>
diff --git a/modules/demux/hls/playlist/HLSSegment.hpp b/modules/demux/hls/playlist/HLSSegment.hpp
index 017b69ce6cf812c0d601698809a872a13b693616..a4c62b7673f5a8060eeb6c1b968ecbaccd10027f 100644
--- a/modules/demux/hls/playlist/HLSSegment.hpp
+++ b/modules/demux/hls/playlist/HLSSegment.hpp
@@ -24,7 +24,7 @@
 # include "config.h"
 #endif
 
-#include "../adaptative/playlist/Segment.h"
+#include "../adaptive/playlist/Segment.h"
 #include <vector>
 #ifdef HAVE_GCRYPT
  #include <gcrypt.h>
@@ -34,7 +34,7 @@ namespace hls
 {
     namespace playlist
     {
-        using namespace adaptative::playlist;
+        using namespace adaptive::playlist;
 
         class SegmentEncryption
         {
diff --git a/modules/demux/hls/playlist/M3U8.cpp b/modules/demux/hls/playlist/M3U8.cpp
index 3fd0755f83deee3c32c7633fc919adaf279171c0..13910a5eb0d2b4e72bfb8d09b49221d2fb734b77 100644
--- a/modules/demux/hls/playlist/M3U8.cpp
+++ b/modules/demux/hls/playlist/M3U8.cpp
@@ -23,8 +23,8 @@
 
 #include "M3U8.hpp"
 #include "Representation.hpp"
-#include "../adaptative/playlist/BasePeriod.h"
-#include "../adaptative/playlist/BaseAdaptationSet.h"
+#include "../adaptive/playlist/BasePeriod.h"
+#include "../adaptive/playlist/BaseAdaptationSet.h"
 
 #include <vlc_common.h>
 #include <vlc_stream.h>
diff --git a/modules/demux/hls/playlist/M3U8.hpp b/modules/demux/hls/playlist/M3U8.hpp
index d3a591eca39c25c7f6d544e9c3564dbb25148b46..78661eca469de8604ce32b1dd41f568cccacd4fb 100644
--- a/modules/demux/hls/playlist/M3U8.hpp
+++ b/modules/demux/hls/playlist/M3U8.hpp
@@ -21,13 +21,13 @@
 #ifndef M3U8_H_
 #define M3U8_H_
 
-#include "../adaptative/playlist/AbstractPlaylist.hpp"
+#include "../adaptive/playlist/AbstractPlaylist.hpp"
 
 namespace hls
 {
     namespace playlist
     {
-        using namespace adaptative::playlist;
+        using namespace adaptive::playlist;
 
         class M3U8 : public AbstractPlaylist
         {
diff --git a/modules/demux/hls/playlist/Parser.cpp b/modules/demux/hls/playlist/Parser.cpp
index 0249b82a08d4b3893f617e9a0c525501cc4eebac..97e4228bc2326de523afc399a2730acab3c013da 100644
--- a/modules/demux/hls/playlist/Parser.cpp
+++ b/modules/demux/hls/playlist/Parser.cpp
@@ -24,12 +24,12 @@
 #include "Parser.hpp"
 #include "HLSSegment.hpp"
 #include "Representation.hpp"
-#include "../adaptative/playlist/BasePeriod.h"
-#include "../adaptative/playlist/BaseAdaptationSet.h"
-#include "../adaptative/playlist/SegmentList.h"
-#include "../adaptative/tools/Retrieve.hpp"
-#include "../adaptative/tools/Helper.h"
-#include "../adaptative/tools/Conversions.hpp"
+#include "../adaptive/playlist/BasePeriod.h"
+#include "../adaptive/playlist/BaseAdaptationSet.h"
+#include "../adaptive/playlist/SegmentList.h"
+#include "../adaptive/tools/Retrieve.hpp"
+#include "../adaptive/tools/Helper.h"
+#include "../adaptive/tools/Conversions.hpp"
 #include "M3U8.hpp"
 #include "Tags.hpp"
 
@@ -41,8 +41,8 @@
 #include <cctype>
 #include <algorithm>
 
-using namespace adaptative;
-using namespace adaptative::playlist;
+using namespace adaptive;
+using namespace adaptive::playlist;
 using namespace hls::playlist;
 
 M3U8Parser::M3U8Parser()
diff --git a/modules/demux/hls/playlist/Parser.hpp b/modules/demux/hls/playlist/Parser.hpp
index 9b675293a985f07436a249603bc0e8e25ace37bf..e314a04ef7d8389ff0a2cb63d6c2f928b3d1bef5 100644
--- a/modules/demux/hls/playlist/Parser.hpp
+++ b/modules/demux/hls/playlist/Parser.hpp
@@ -24,14 +24,14 @@
 # include "config.h"
 #endif
 
-#include "../adaptative/playlist/SegmentInfoCommon.h"
+#include "../adaptive/playlist/SegmentInfoCommon.h"
 
 #include <cstdlib>
 #include <sstream>
 
 #include <vlc_common.h>
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
@@ -46,7 +46,7 @@ namespace hls
 {
     namespace playlist
     {
-        using namespace adaptative::playlist;
+        using namespace adaptive::playlist;
 
         class M3U8;
         class AttributesTag;
diff --git a/modules/demux/hls/playlist/Representation.cpp b/modules/demux/hls/playlist/Representation.cpp
index 839e13fae1496ad04497bd31f85997d5aa07af2a..1141ec225590fe2484e5c4d5f478b77636e3d5e3 100644
--- a/modules/demux/hls/playlist/Representation.cpp
+++ b/modules/demux/hls/playlist/Representation.cpp
@@ -27,9 +27,9 @@
 #include "M3U8.hpp"
 #include "Parser.hpp"
 #include "HLSSegment.hpp"
-#include "../adaptative/playlist/BasePeriod.h"
-#include "../adaptative/playlist/BaseAdaptationSet.h"
-#include "../adaptative/playlist/SegmentList.h"
+#include "../adaptive/playlist/BasePeriod.h"
+#include "../adaptive/playlist/BaseAdaptationSet.h"
+#include "../adaptive/playlist/SegmentList.h"
 
 #include <ctime>
 
diff --git a/modules/demux/hls/playlist/Representation.hpp b/modules/demux/hls/playlist/Representation.hpp
index bda9b67286c55f889f955f2d086a20b6aaba4295..6bdc5f5d65ac16fdba4582373f1fe1f61c2957a2 100644
--- a/modules/demux/hls/playlist/Representation.hpp
+++ b/modules/demux/hls/playlist/Representation.hpp
@@ -21,9 +21,9 @@
 #ifndef HLSREPRESENTATION_H_
 #define HLSREPRESENTATION_H_
 
-#include "../adaptative/playlist/BaseRepresentation.h"
-#include "../adaptative/tools/Properties.hpp"
-#include "../adaptative/StreamFormat.hpp"
+#include "../adaptive/playlist/BaseRepresentation.h"
+#include "../adaptive/tools/Properties.hpp"
+#include "../adaptive/StreamFormat.hpp"
 
 namespace hls
 {
@@ -31,8 +31,8 @@ namespace hls
     {
         class M3U8;
 
-        using namespace adaptative;
-        using namespace adaptative::playlist;
+        using namespace adaptive;
+        using namespace adaptive::playlist;
 
         class Representation : public BaseRepresentation
         {
diff --git a/modules/demux/smooth/SmoothManager.cpp b/modules/demux/smooth/SmoothManager.cpp
index 745d2d99565edba0819ac11a1478b6ff214440eb..c5cada373255064e0b2cd2d316640d5af1c3db68 100644
--- a/modules/demux/smooth/SmoothManager.cpp
+++ b/modules/demux/smooth/SmoothManager.cpp
@@ -23,16 +23,16 @@
 # include "config.h"
 #endif
 
-#include "../adaptative/tools/Retrieve.hpp"
+#include "../adaptive/tools/Retrieve.hpp"
 #include "playlist/Parser.hpp"
-#include "../adaptative/xml/DOMParser.h"
+#include "../adaptive/xml/DOMParser.h"
 #include <vlc_stream.h>
 #include <vlc_demux.h>
 #include <vlc_charset.h>
 #include <time.h>
 
-using namespace adaptative;
-using namespace adaptative::logic;
+using namespace adaptive;
+using namespace adaptive::logic;
 using namespace smooth;
 using namespace smooth::playlist;
 
diff --git a/modules/demux/smooth/SmoothManager.hpp b/modules/demux/smooth/SmoothManager.hpp
index 6773ab1b67cebb1c563647fdf55b45fb48aa8648..040df1f717a47efcc0355813e3d751279fa1534b 100644
--- a/modules/demux/smooth/SmoothManager.hpp
+++ b/modules/demux/smooth/SmoothManager.hpp
@@ -20,11 +20,11 @@
 #ifndef SMOOTHMANAGER_HPP
 #define SMOOTHMANAGER_HPP
 
-#include "../adaptative/PlaylistManager.h"
-#include "../adaptative/logic/AbstractAdaptationLogic.h"
+#include "../adaptive/PlaylistManager.h"
+#include "../adaptive/logic/AbstractAdaptationLogic.h"
 #include "playlist/Manifest.hpp"
 
-namespace adaptative
+namespace adaptive
 {
     namespace xml
     {
@@ -34,7 +34,7 @@ namespace adaptative
 
 namespace smooth
 {
-    using namespace adaptative;
+    using namespace adaptive;
 
     class SmoothManager : public PlaylistManager
     {
diff --git a/modules/demux/smooth/SmoothStream.hpp b/modules/demux/smooth/SmoothStream.hpp
index 93d28144f2e416ef7b621d4611953e18573a343e..5aee3f8c62bbedcad47d5a4a9eb9cddad50701e4 100644
--- a/modules/demux/smooth/SmoothStream.hpp
+++ b/modules/demux/smooth/SmoothStream.hpp
@@ -24,11 +24,11 @@
 # include "config.h"
 #endif
 
-#include "../adaptative/Streams.hpp"
+#include "../adaptive/Streams.hpp"
 
 namespace smooth
 {
-    using namespace adaptative;
+    using namespace adaptive;
 
     class SmoothStream : public AbstractStream
     {
diff --git a/modules/demux/smooth/mp4/IndexReader.cpp b/modules/demux/smooth/mp4/IndexReader.cpp
index e57ab97abec4491f17e19bd4cfeccc9bde8ff59c..7246158c8cf7f1372fc9eed3d535b9abc40f944d 100644
--- a/modules/demux/smooth/mp4/IndexReader.cpp
+++ b/modules/demux/smooth/mp4/IndexReader.cpp
@@ -18,13 +18,13 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #include "IndexReader.hpp"
-#include "../adaptative/playlist/BaseRepresentation.h"
-#include "../adaptative/playlist/BaseAdaptationSet.h"
-#include "../adaptative/playlist/SegmentTemplate.h"
-#include "../adaptative/playlist/SegmentTimeline.h"
-#include "../adaptative/playlist/AbstractPlaylist.hpp"
+#include "../adaptive/playlist/BaseRepresentation.h"
+#include "../adaptive/playlist/BaseAdaptationSet.h"
+#include "../adaptive/playlist/SegmentTemplate.h"
+#include "../adaptive/playlist/SegmentTimeline.h"
+#include "../adaptive/playlist/AbstractPlaylist.hpp"
 
-using namespace adaptative::mp4;
+using namespace adaptive::mp4;
 using namespace smooth::mp4;
 
 IndexReader::IndexReader(vlc_object_t *obj)
diff --git a/modules/demux/smooth/mp4/IndexReader.hpp b/modules/demux/smooth/mp4/IndexReader.hpp
index e7acba298bea160eff28c0c3d629e8a7f5aaaaf5..c270ddc9a5df6b33abf5bd005c501ea740304827 100644
--- a/modules/demux/smooth/mp4/IndexReader.hpp
+++ b/modules/demux/smooth/mp4/IndexReader.hpp
@@ -20,9 +20,9 @@
 #ifndef SMOOTHINDEXREADER_HPP
 #define SMOOTHINDEXREADER_HPP
 
-#include "../adaptative/mp4/AtomsReader.hpp"
+#include "../adaptive/mp4/AtomsReader.hpp"
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
@@ -34,8 +34,8 @@ namespace smooth
 {
     namespace mp4
     {
-        using namespace adaptative::mp4;
-        using namespace adaptative::playlist;
+        using namespace adaptive::mp4;
+        using namespace adaptive::playlist;
 
         class IndexReader : public AtomsReader
         {
diff --git a/modules/demux/smooth/playlist/ForgedInitSegment.cpp b/modules/demux/smooth/playlist/ForgedInitSegment.cpp
index c7de0a42e8c3ea1b912408f7fd8dd3552739500c..34a05a60d2819b5243dc5258c5448eeaab486af1 100644
--- a/modules/demux/smooth/playlist/ForgedInitSegment.cpp
+++ b/modules/demux/smooth/playlist/ForgedInitSegment.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 #include "ForgedInitSegment.hpp"
 #include "MemoryChunk.hpp"
-#include "../adaptative/playlist/SegmentChunk.hpp"
+#include "../adaptive/playlist/SegmentChunk.hpp"
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -35,7 +35,7 @@ extern "C"
     #include "../../demux/mp4/libmp4.h" /* majors */
 }
 
-using namespace adaptative::playlist;
+using namespace adaptive::playlist;
 using namespace smooth::playlist;
 using namespace smooth::http;
 
diff --git a/modules/demux/smooth/playlist/ForgedInitSegment.hpp b/modules/demux/smooth/playlist/ForgedInitSegment.hpp
index 4eb6c51e5cca6d5c4ffc8dd3a64c6e7d44ba05f3..933d2a6bd28939de6203ca0f807c9d39dbbb642e 100644
--- a/modules/demux/smooth/playlist/ForgedInitSegment.hpp
+++ b/modules/demux/smooth/playlist/ForgedInitSegment.hpp
@@ -20,8 +20,8 @@
 #ifndef FORGEDINITSEGMENT_HPP
 #define FORGEDINITSEGMENT_HPP
 
-#include "../adaptative/playlist/Segment.h"
-#include "../adaptative/playlist/Inheritables.hpp"
+#include "../adaptive/playlist/Segment.h"
+#include "../adaptive/playlist/Inheritables.hpp"
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -33,8 +33,8 @@ namespace smooth
 {
     namespace playlist
     {
-        using namespace adaptative::playlist;
-        using namespace adaptative::http;
+        using namespace adaptive::playlist;
+        using namespace adaptive::http;
 
         class ForgedInitSegment : public InitSegment,
                                   public TimescaleAble
diff --git a/modules/demux/smooth/playlist/Manifest.cpp b/modules/demux/smooth/playlist/Manifest.cpp
index f7e79867afa42d82315eb8038c8a919e1f313369..57f4215aeb7cd83a1ea9d636529c1c81d5a9b65e 100644
--- a/modules/demux/smooth/playlist/Manifest.cpp
+++ b/modules/demux/smooth/playlist/Manifest.cpp
@@ -22,7 +22,7 @@
 #endif
 
 #include "Manifest.hpp"
-#include "../adaptative/playlist/BasePeriod.h"
+#include "../adaptive/playlist/BasePeriod.h"
 
 #include <vlc_common.h>
 #include <vlc_stream.h>
diff --git a/modules/demux/smooth/playlist/Manifest.hpp b/modules/demux/smooth/playlist/Manifest.hpp
index 7af94e71b7b39a4d1324d27df59e117bec0b7023..fea9e3f619a1cc3e1417c1c581b592ae17b96fab 100644
--- a/modules/demux/smooth/playlist/Manifest.hpp
+++ b/modules/demux/smooth/playlist/Manifest.hpp
@@ -20,13 +20,13 @@
 #ifndef MANIFEST_HPP
 #define MANIFEST_HPP
 
-#include "../adaptative/playlist/AbstractPlaylist.hpp"
+#include "../adaptive/playlist/AbstractPlaylist.hpp"
 
 namespace smooth
 {
     namespace playlist
     {
-        using namespace adaptative::playlist;
+        using namespace adaptive::playlist;
 
         class Manifest : public AbstractPlaylist
         {
diff --git a/modules/demux/smooth/playlist/MemoryChunk.hpp b/modules/demux/smooth/playlist/MemoryChunk.hpp
index 2a546110e79a2b287379229cdf527589da7a5ea2..0bfc9206ba2d348850c831c8db684596a6e1e0c2 100644
--- a/modules/demux/smooth/playlist/MemoryChunk.hpp
+++ b/modules/demux/smooth/playlist/MemoryChunk.hpp
@@ -20,13 +20,13 @@
 #ifndef MEMORYCHUNK_HPP
 #define MEMORYCHUNK_HPP
 
-#include "../adaptative/http/Chunk.h"
+#include "../adaptive/http/Chunk.h"
 
 namespace smooth
 {
     namespace http
     {
-        using namespace adaptative::http;
+        using namespace adaptive::http;
 
         class MemoryChunkSource : public AbstractChunkSource
         {
diff --git a/modules/demux/smooth/playlist/Parser.cpp b/modules/demux/smooth/playlist/Parser.cpp
index f4881862b77fefbc2889ce0199b0c1bf87f39212..fa9988afed0cf87b2f9f66890868ce65f939c552 100644
--- a/modules/demux/smooth/playlist/Parser.cpp
+++ b/modules/demux/smooth/playlist/Parser.cpp
@@ -23,17 +23,17 @@
 #include "Representation.hpp"
 #include "ForgedInitSegment.hpp"
 #include "SmoothSegment.hpp"
-#include "../adaptative/playlist/BasePeriod.h"
-#include "../adaptative/playlist/BaseAdaptationSet.h"
-#include "../adaptative/playlist/SegmentTimeline.h"
-#include "../adaptative/playlist/SegmentList.h"
-#include "../adaptative/xml/DOMHelper.h"
-#include "../adaptative/xml/Node.h"
-#include "../adaptative/tools/Helper.h"
-#include "../adaptative/tools/Conversions.hpp"
+#include "../adaptive/playlist/BasePeriod.h"
+#include "../adaptive/playlist/BaseAdaptationSet.h"
+#include "../adaptive/playlist/SegmentTimeline.h"
+#include "../adaptive/playlist/SegmentList.h"
+#include "../adaptive/xml/DOMHelper.h"
+#include "../adaptive/xml/Node.h"
+#include "../adaptive/tools/Helper.h"
+#include "../adaptive/tools/Conversions.hpp"
 
 using namespace smooth::playlist;
-using namespace adaptative::xml;
+using namespace adaptive::xml;
 
 ManifestParser::ManifestParser(Node *root_, stream_t *stream, const std::string & streambaseurl_)
 {
diff --git a/modules/demux/smooth/playlist/Parser.hpp b/modules/demux/smooth/playlist/Parser.hpp
index 9a48d5b0c8288383e6b271d49fd5a2af4daec9d4..390a1be1f3b46b0ef3f5f78ed3aaeb35658429ba 100644
--- a/modules/demux/smooth/playlist/Parser.hpp
+++ b/modules/demux/smooth/playlist/Parser.hpp
@@ -24,14 +24,14 @@
 # include "config.h"
 #endif
 
-#include "../adaptative/playlist/SegmentInfoCommon.h"
+#include "../adaptive/playlist/SegmentInfoCommon.h"
 
 #include <cstdlib>
 #include <sstream>
 
 #include <vlc_common.h>
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
@@ -50,8 +50,8 @@ namespace smooth
 {
     namespace playlist
     {
-        using namespace adaptative::playlist;
-        using namespace adaptative;
+        using namespace adaptive::playlist;
+        using namespace adaptive;
 
         class Manifest;
 
diff --git a/modules/demux/smooth/playlist/Representation.cpp b/modules/demux/smooth/playlist/Representation.cpp
index 3d87a2d1b35ddb4fe7b71669388f15f0c2569956..c2645250cea6016eeb8472201c2a49c8a7216b13 100644
--- a/modules/demux/smooth/playlist/Representation.cpp
+++ b/modules/demux/smooth/playlist/Representation.cpp
@@ -19,9 +19,9 @@
  *****************************************************************************/
 #include "Representation.hpp"
 #include "Manifest.hpp"
-#include "../adaptative/playlist/SegmentTemplate.h"
-#include "../adaptative/playlist/SegmentTimeline.h"
-#include "../adaptative/playlist/BaseAdaptationSet.h"
+#include "../adaptive/playlist/SegmentTemplate.h"
+#include "../adaptive/playlist/SegmentTimeline.h"
+#include "../adaptive/playlist/BaseAdaptationSet.h"
 
 using namespace smooth::playlist;
 
diff --git a/modules/demux/smooth/playlist/Representation.hpp b/modules/demux/smooth/playlist/Representation.hpp
index a5db0c62f1c9210c567413f21cb92c3551a2596f..ada12f4d42f73f7a4712d8133a171bff1341e3b6 100644
--- a/modules/demux/smooth/playlist/Representation.hpp
+++ b/modules/demux/smooth/playlist/Representation.hpp
@@ -20,10 +20,10 @@
 #ifndef SMOOTHREPRESENTATION_HPP
 #define SMOOTHREPRESENTATION_HPP
 
-#include "../adaptative/playlist/SegmentInfoCommon.h"
-#include "../adaptative/playlist/BaseRepresentation.h"
+#include "../adaptive/playlist/SegmentInfoCommon.h"
+#include "../adaptive/playlist/BaseRepresentation.h"
 
-namespace adaptative
+namespace adaptive
 {
     namespace playlist
     {
@@ -35,8 +35,8 @@ namespace smooth
 {
     namespace playlist
     {
-        using namespace adaptative;
-        using namespace adaptative::playlist;
+        using namespace adaptive;
+        using namespace adaptive::playlist;
 
         class Representation : public BaseRepresentation
         {
diff --git a/modules/demux/smooth/playlist/SmoothSegment.cpp b/modules/demux/smooth/playlist/SmoothSegment.cpp
index b26dfbb7705f496605527dac76932fc904668d76..858ee4247eed9a2e3a711aab6a950151ff9ee350 100644
--- a/modules/demux/smooth/playlist/SmoothSegment.cpp
+++ b/modules/demux/smooth/playlist/SmoothSegment.cpp
@@ -20,8 +20,8 @@
 
 #include "SmoothSegment.hpp"
 
-#include "../adaptative/playlist/BaseRepresentation.h"
-#include "../adaptative/playlist/AbstractPlaylist.hpp"
+#include "../adaptive/playlist/BaseRepresentation.h"
+#include "../adaptive/playlist/AbstractPlaylist.hpp"
 #include "../mp4/IndexReader.hpp"
 
 using namespace smooth::playlist;
diff --git a/modules/demux/smooth/playlist/SmoothSegment.hpp b/modules/demux/smooth/playlist/SmoothSegment.hpp
index a4e628c297f0cab11da383175e17b006635460b4..307d8fdf31b17a19e8946dbc1e4e91ffcecf6631 100644
--- a/modules/demux/smooth/playlist/SmoothSegment.hpp
+++ b/modules/demux/smooth/playlist/SmoothSegment.hpp
@@ -20,13 +20,13 @@
 #ifndef SMOOTHSEGMENT_HPP
 #define SMOOTHSEGMENT_HPP
 
-#include "../adaptative/playlist/SegmentTemplate.h"
+#include "../adaptive/playlist/SegmentTemplate.h"
 
 namespace smooth
 {
     namespace playlist
     {
-        using namespace adaptative::playlist;
+        using namespace adaptive::playlist;
 
         class SmoothSegment : public MediaSegmentTemplate
         {
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 394b72a8584a7c2156b794663cf7941a51651151..12811e439e10971aa6aa346c91ca25c7db790f56 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -442,7 +442,7 @@ modules/control/ntservice.c
 modules/control/oldrc.c
 modules/control/unimotion.c
 modules/control/unimotion.h
-modules/demux/adaptative/adaptative.cpp
+modules/demux/adaptive/adaptive.cpp
 modules/demux/aiff.c
 modules/demux/asf/asf.c
 modules/demux/asf/libasf.c