diff --git a/codec/console/enc/src/welsenc.cpp b/codec/console/enc/src/welsenc.cpp
index 24a01217..ed3c613c 100644
--- a/codec/console/enc/src/welsenc.cpp
+++ b/codec/console/enc/src/welsenc.cpp
@@ -84,7 +84,7 @@
 
 #include <iostream>
 using namespace std;
-using namespace WelsSVCEnc;
+using namespace WelsEnc;
 
 /*
  *	Layer Context
diff --git a/codec/encoder/core/inc/au_set.h b/codec/encoder/core/inc/au_set.h
index 3a6004e6..c6fc27bb 100644
--- a/codec/encoder/core/inc/au_set.h
+++ b/codec/encoder/core/inc/au_set.h
@@ -46,7 +46,7 @@
 #include "parameter_sets.h"
 #include "param_svc.h"
 #include "utils.h"
-namespace WelsSVCEnc {
+namespace WelsEnc {
 /*!
  *************************************************************************************
  * \brief	to write Sequence Parameter Set (SPS)
diff --git a/codec/encoder/core/inc/bit_stream.h b/codec/encoder/core/inc/bit_stream.h
index 248fde3f..a0ed2418 100644
--- a/codec/encoder/core/inc/bit_stream.h
+++ b/codec/encoder/core/inc/bit_stream.h
@@ -36,7 +36,7 @@
 
 #include "typedefs.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 //#include "macros.h"
 
 /*
diff --git a/codec/encoder/core/inc/deblocking.h b/codec/encoder/core/inc/deblocking.h
index 23861216..87fc8607 100644
--- a/codec/encoder/core/inc/deblocking.h
+++ b/codec/encoder/core/inc/deblocking.h
@@ -44,7 +44,7 @@
 #include "encoder_context.h"
 #include "wels_func_ptr_def.h"
 #include "deblocking_common.h"
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 
 //struct tagDeblockingFunc;
diff --git a/codec/encoder/core/inc/decode_mb_aux.h b/codec/encoder/core/inc/decode_mb_aux.h
index d12d2b2a..f64faa8b 100644
--- a/codec/encoder/core/inc/decode_mb_aux.h
+++ b/codec/encoder/core/inc/decode_mb_aux.h
@@ -37,7 +37,7 @@
 #include "macros.h"
 #include "wels_func_ptr_def.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 void WelsDequantLumaDc4x4 (int16_t* pRes, const int32_t kiQp);
 void WelsIHadamard4x4Dc (int16_t* pRes);
 
diff --git a/codec/encoder/core/inc/dq_map.h b/codec/encoder/core/inc/dq_map.h
index a17df8ca..32c59bd5 100644
--- a/codec/encoder/core/inc/dq_map.h
+++ b/codec/encoder/core/inc/dq_map.h
@@ -42,7 +42,7 @@
 #if !defined(WELS_ENCODER_DEPENDENCY_QUAILITY_IDC_MAP_H__)
 #define WELS_ENCODER_DEPENDENCY_QUAILITY_IDC_MAP_H__
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 /*
  *	Dependency Quality IDC
  */
diff --git a/codec/encoder/core/inc/encode_mb_aux.h b/codec/encoder/core/inc/encode_mb_aux.h
index ecda5e5b..16610c71 100644
--- a/codec/encoder/core/inc/encode_mb_aux.h
+++ b/codec/encoder/core/inc/encode_mb_aux.h
@@ -37,7 +37,7 @@
 #include "wels_func_ptr_def.h"
 #include "copy_mb.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 void WelsInitEncodingFuncs (SWelsFuncPtrList* pFuncList, uint32_t  uiCpuFlag);
 int32_t WelsGetNoneZeroCount_c (int16_t* pLevel);
 
diff --git a/codec/encoder/core/inc/encoder.h b/codec/encoder/core/inc/encoder.h
index fef9c7a4..ebeb57aa 100644
--- a/codec/encoder/core/inc/encoder.h
+++ b/codec/encoder/core/inc/encoder.h
@@ -42,7 +42,7 @@
 
 #include "encoder_context.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 /*!
  * \brief	request specific memory for SVC
  * \param	pEncCtx		sWelsEncCtx*
diff --git a/codec/encoder/core/inc/encoder_context.h b/codec/encoder/core/inc/encoder_context.h
index 96066704..a176aead 100644
--- a/codec/encoder/core/inc/encoder_context.h
+++ b/codec/encoder/core/inc/encoder_context.h
@@ -58,7 +58,7 @@
 #include "mt_defs.h"	// for multiple threadin,
 #include "WelsThreadLib.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 /*
  *	reference list for each quality layer in SVC
diff --git a/codec/encoder/core/inc/extern.h b/codec/encoder/core/inc/extern.h
index 7e3dc3ff..99a96529 100644
--- a/codec/encoder/core/inc/extern.h
+++ b/codec/encoder/core/inc/extern.h
@@ -43,7 +43,7 @@
 #include "typedefs.h"
 #include "encoder_context.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 /*!
  * \brief	initialize source picture body
diff --git a/codec/encoder/core/inc/get_intra_predictor.h b/codec/encoder/core/inc/get_intra_predictor.h
index a966e9ca..2a655890 100644
--- a/codec/encoder/core/inc/get_intra_predictor.h
+++ b/codec/encoder/core/inc/get_intra_predictor.h
@@ -44,7 +44,7 @@
 #include "typedefs.h"
 #include "wels_func_ptr_def.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 void WelsI4x4LumaPredV_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
 void WelsI4x4LumaPredH_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
 void WelsI4x4LumaPredDc_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
diff --git a/codec/encoder/core/inc/mb_cache.h b/codec/encoder/core/inc/mb_cache.h
index db15a79e..02a0e4be 100644
--- a/codec/encoder/core/inc/mb_cache.h
+++ b/codec/encoder/core/inc/mb_cache.h
@@ -39,7 +39,7 @@
 #include "wels_const.h"
 #include "macros.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 /*
  *	MB Cache information, such one cache should be defined within a slice
diff --git a/codec/encoder/core/inc/mc.h b/codec/encoder/core/inc/mc.h
index 34d27f28..fccff2ce 100644
--- a/codec/encoder/core/inc/mc.h
+++ b/codec/encoder/core/inc/mc.h
@@ -44,7 +44,7 @@
 /////////////////////luma MC//////////////////////////
 //x y means dx(mv[0] & 3) and dy(mv[1] & 3)
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 void WelsInitMcFuncs (SWelsFuncPtrList* pFuncList, uint32_t uiCpuFlag);
 
 }
diff --git a/codec/encoder/core/inc/md.h b/codec/encoder/core/inc/md.h
index 8dde41d7..135d11d5 100644
--- a/codec/encoder/core/inc/md.h
+++ b/codec/encoder/core/inc/md.h
@@ -45,7 +45,7 @@
 #include "encode_mb_aux.h"
 #include "wels_func_ptr_def.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 #define ME_REFINE_BUF_STRIDE       32
 #define ME_REFINE_BUF_WIDTH_BLK4   8
 #define ME_REFINE_BUF_WIDTH_BLK8   16
diff --git a/codec/encoder/core/inc/memory_align.h b/codec/encoder/core/inc/memory_align.h
index f751aff1..387f5afc 100644
--- a/codec/encoder/core/inc/memory_align.h
+++ b/codec/encoder/core/inc/memory_align.h
@@ -39,7 +39,7 @@
 #include <stdio.h>
 #endif//MEMORY_CHECK
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 class CMemoryAlign {
  public:
diff --git a/codec/encoder/core/inc/mv_pred.h b/codec/encoder/core/inc/mv_pred.h
index 272553e7..439a52c4 100644
--- a/codec/encoder/core/inc/mv_pred.h
+++ b/codec/encoder/core/inc/mv_pred.h
@@ -45,7 +45,7 @@
 #include "svc_enc_macroblock.h"
 #include "mb_cache.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 /*!
  * \brief   update pMv and uiRefIndex cache for current MB, only for P_16x16 (SKIP inclusive)
  * \param
diff --git a/codec/encoder/core/inc/nal_encap.h b/codec/encoder/core/inc/nal_encap.h
index 571b14c7..4eabbf04 100644
--- a/codec/encoder/core/inc/nal_encap.h
+++ b/codec/encoder/core/inc/nal_encap.h
@@ -45,7 +45,7 @@
 #include "nal_prefix.h"
 
 //SBitStringAux
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 #define NAL_HEADER_SIZE (4)
 /*
diff --git a/codec/encoder/core/inc/nal_prefix.h b/codec/encoder/core/inc/nal_prefix.h
index 5aef8a3b..a1358e21 100644
--- a/codec/encoder/core/inc/nal_prefix.h
+++ b/codec/encoder/core/inc/nal_prefix.h
@@ -38,7 +38,7 @@
 #include "wels_common_basis.h"
 #include "slice.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 ///////////////////////////////////NAL Unit prefix/headers///////////////////////////////////
 
 /* NAL Unix Header in AVC, refer to Page 56 in JVT X201wcm */
diff --git a/codec/encoder/core/inc/param_svc.h b/codec/encoder/core/inc/param_svc.h
index e2dbbe04..6949abfe 100644
--- a/codec/encoder/core/inc/param_svc.h
+++ b/codec/encoder/core/inc/param_svc.h
@@ -51,7 +51,7 @@
 #include "svc_enc_slice_segment.h"
 #include "as264_common.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 #define   INVALID_TEMPORAL_ID   ((uint8_t)0xff)
 
@@ -513,6 +513,6 @@ if (NULL == pCodingParam)
 return 0;
 }
 
-}//end of namespace WelsSVCEnc
+}//end of namespace WelsEnc
 
 #endif//WELS_ENCODER_PARAMETER_SVC_H__
diff --git a/codec/encoder/core/inc/parameter_sets.h b/codec/encoder/core/inc/parameter_sets.h
index f02ae199..67e3aa64 100644
--- a/codec/encoder/core/inc/parameter_sets.h
+++ b/codec/encoder/core/inc/parameter_sets.h
@@ -37,7 +37,7 @@
 #include "wels_const.h"
 #include "wels_common_basis.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 /* Sequence Parameter Set, refer to Page 57 in JVT X201wcm */
 typedef struct TagWelsSPS {
diff --git a/codec/encoder/core/inc/picture.h b/codec/encoder/core/inc/picture.h
index 3cdb60b4..e67bd95d 100644
--- a/codec/encoder/core/inc/picture.h
+++ b/codec/encoder/core/inc/picture.h
@@ -38,7 +38,7 @@
 #include "as264_common.h"
 #include "wels_common_basis.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 #define LIST_SIZE      0x10000    //(256*256)
 typedef struct TagScreenBlockFeatureStorage {
 //Input
@@ -112,7 +112,7 @@ SScreenBlockFeatureStorage* pScreenBlockFeatureStorage;
 //  int32_t    planes;      // planes of YUV
 //}Rs_Picture_t;
 
-}  // end of namespace WelsSVCEnc {
+}  // end of namespace WelsEnc {
 
 #endif//WELS_PICTURE_H__
 
diff --git a/codec/encoder/core/inc/picture_handle.h b/codec/encoder/core/inc/picture_handle.h
index f1734748..babfb328 100644
--- a/codec/encoder/core/inc/picture_handle.h
+++ b/codec/encoder/core/inc/picture_handle.h
@@ -43,7 +43,7 @@
 #include "typedefs.h"
 #include "memory_align.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 /*!
  * \brief	alloc picture pData with borders for each plane based width and height of picture
  * \param	kiWidth				width of picture in pixels
diff --git a/codec/encoder/core/inc/property.h b/codec/encoder/core/inc/property.h
index e0003843..492e1bda 100644
--- a/codec/encoder/core/inc/property.h
+++ b/codec/encoder/core/inc/property.h
@@ -42,7 +42,7 @@
 
 #include "typedefs.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 
 /*!
diff --git a/codec/encoder/core/inc/rc.h b/codec/encoder/core/inc/rc.h
index 2d010e46..242d69cc 100644
--- a/codec/encoder/core/inc/rc.h
+++ b/codec/encoder/core/inc/rc.h
@@ -48,7 +48,7 @@
 #include "svc_enc_macroblock.h"
 #include "slice.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 //trace
 #define GOM_TRACE_FLAG 0
 #define GOM_H_SCC               8
diff --git a/codec/encoder/core/inc/ref_list_mgr_svc.h b/codec/encoder/core/inc/ref_list_mgr_svc.h
index fd2210f8..1a9fed21 100644
--- a/codec/encoder/core/inc/ref_list_mgr_svc.h
+++ b/codec/encoder/core/inc/ref_list_mgr_svc.h
@@ -46,7 +46,7 @@
 #include "encoder_context.h"
 #include "codec_app_def.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 typedef enum {
 RECIEVE_UNKOWN = 0,
 RECIEVE_SUCCESS = 1,
diff --git a/codec/encoder/core/inc/sample.h b/codec/encoder/core/inc/sample.h
index 13f538fa..30614a71 100644
--- a/codec/encoder/core/inc/sample.h
+++ b/codec/encoder/core/inc/sample.h
@@ -36,7 +36,7 @@
 #include "typedefs.h"
 #include "wels_func_ptr_def.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 //======================SATD======================//
 int32_t WelsSampleSatd16x16_c (uint8_t*, int32_t, uint8_t*, int32_t);
diff --git a/codec/encoder/core/inc/set_mb_syn_cavlc.h b/codec/encoder/core/inc/set_mb_syn_cavlc.h
index bac2567b..25968d8c 100644
--- a/codec/encoder/core/inc/set_mb_syn_cavlc.h
+++ b/codec/encoder/core/inc/set_mb_syn_cavlc.h
@@ -45,7 +45,7 @@
 #include "bit_stream.h"
 #include "wels_func_ptr_def.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 
 
diff --git a/codec/encoder/core/inc/slice.h b/codec/encoder/core/inc/slice.h
index f2947fb3..12d09ad6 100644
--- a/codec/encoder/core/inc/slice.h
+++ b/codec/encoder/core/inc/slice.h
@@ -44,7 +44,7 @@
 #include "bit_stream.h"
 
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 /*******************************sub struct of slice header****************************/
 
diff --git a/codec/encoder/core/inc/slice_multi_threading.h b/codec/encoder/core/inc/slice_multi_threading.h
index 22717f78..c6334dad 100644
--- a/codec/encoder/core/inc/slice_multi_threading.h
+++ b/codec/encoder/core/inc/slice_multi_threading.h
@@ -50,7 +50,7 @@
 #include "svc_enc_slice_segment.h"
 #include "WelsThreadLib.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 void UpdateMbListNeighborParallel (SSliceCtx* pSliceCtx,
                                    SMB* pMbList,
                                    const int32_t kiSliceIdc);
diff --git a/codec/encoder/core/inc/stat.h b/codec/encoder/core/inc/stat.h
index 0c5234db..76b6056a 100644
--- a/codec/encoder/core/inc/stat.h
+++ b/codec/encoder/core/inc/stat.h
@@ -40,7 +40,7 @@
 #if !defined(WELS_ENCODER_STATISTICAL_DATA_H__)
 #define WELS_ENCODER_STATISTICAL_DATA_H__
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 /*
  *	Stat quality
diff --git a/codec/encoder/core/inc/svc_base_layer_md.h b/codec/encoder/core/inc/svc_base_layer_md.h
index 75bfaf71..ee25d96c 100644
--- a/codec/encoder/core/inc/svc_base_layer_md.h
+++ b/codec/encoder/core/inc/svc_base_layer_md.h
@@ -43,7 +43,7 @@
 #include "md.h"
 #include "mb_cache.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 void WelsMdIntraInit (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, const int32_t kiSliceFirstMbXY);
 int32_t WelsMdI16x16 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SMbCache* pMbCache, int32_t iLambda);
 int32_t WelsMdIntraChroma (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SMbCache* pMbCache, int32_t iLambda);
diff --git a/codec/encoder/core/inc/svc_enc_frame.h b/codec/encoder/core/inc/svc_enc_frame.h
index eb135168..52c49047 100644
--- a/codec/encoder/core/inc/svc_enc_frame.h
+++ b/codec/encoder/core/inc/svc_enc_frame.h
@@ -46,7 +46,7 @@
 
 
 #include "svc_enc_slice_segment.h"
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 /*
  *	Frame level in SVC DQLayer instead.
diff --git a/codec/encoder/core/inc/svc_enc_golomb.h b/codec/encoder/core/inc/svc_enc_golomb.h
index 02c2d266..11c422fc 100644
--- a/codec/encoder/core/inc/svc_enc_golomb.h
+++ b/codec/encoder/core/inc/svc_enc_golomb.h
@@ -44,7 +44,7 @@
 #include "bit_stream.h"
 #include "macros.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 #define WRITE_BE_32(ptr, val) do { \
         (ptr)[0] = (val) >> 24; \
diff --git a/codec/encoder/core/inc/svc_enc_macroblock.h b/codec/encoder/core/inc/svc_enc_macroblock.h
index 811c2a23..4f024f6b 100644
--- a/codec/encoder/core/inc/svc_enc_macroblock.h
+++ b/codec/encoder/core/inc/svc_enc_macroblock.h
@@ -39,7 +39,7 @@
 #include "wels_common_basis.h"
 #include "macros.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 //struct Mb_s;
 
diff --git a/codec/encoder/core/inc/svc_enc_slice_segment.h b/codec/encoder/core/inc/svc_enc_slice_segment.h
index 056c7ee1..45985ba1 100644
--- a/codec/encoder/core/inc/svc_enc_slice_segment.h
+++ b/codec/encoder/core/inc/svc_enc_slice_segment.h
@@ -46,7 +46,7 @@
 #include "memory_align.h"
 
 #include "codec_app_def.h"
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 
 // NOTE:
diff --git a/codec/encoder/core/inc/svc_encode_mb.h b/codec/encoder/core/inc/svc_encode_mb.h
index ee171904..a7d6b791 100644
--- a/codec/encoder/core/inc/svc_encode_mb.h
+++ b/codec/encoder/core/inc/svc_encode_mb.h
@@ -48,7 +48,7 @@
 #include "encoder_context.h"
 #include "wels_func_ptr_def.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 void	WelsDctMb (int16_t* pRs, uint8_t* pEncMb, int32_t iEncStride, uint8_t* pBestPred, PDctFunc pfDctFourT4);
 
 void	WelsEncRecI16x16Y (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache);
diff --git a/codec/encoder/core/inc/svc_encode_slice.h b/codec/encoder/core/inc/svc_encode_slice.h
index 39479888..acfecc69 100644
--- a/codec/encoder/core/inc/svc_encode_slice.h
+++ b/codec/encoder/core/inc/svc_encode_slice.h
@@ -45,7 +45,7 @@
 #include "svc_enc_macroblock.h"
 #include "mb_cache.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 #if defined(MB_TYPES_CHECK)
 void WelsCountMbType (int32_t (*iMbCount)[18], const EWelsSliceType eSt, const SMB* pMb);
 #endif
diff --git a/codec/encoder/core/inc/svc_mode_decision.h b/codec/encoder/core/inc/svc_mode_decision.h
index 9221bed4..ae2f9426 100644
--- a/codec/encoder/core/inc/svc_mode_decision.h
+++ b/codec/encoder/core/inc/svc_mode_decision.h
@@ -47,7 +47,7 @@
 #include "md.h"
 
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 ////////////////////////
 // INTERFACE, called by svc_encode_slice.c
 ///////////////////////
diff --git a/codec/encoder/core/inc/svc_motion_estimate.h b/codec/encoder/core/inc/svc_motion_estimate.h
index 8af2346f..fe4a1b4c 100644
--- a/codec/encoder/core/inc/svc_motion_estimate.h
+++ b/codec/encoder/core/inc/svc_motion_estimate.h
@@ -44,7 +44,7 @@
 #include "encoder_context.h"
 #include "wels_func_ptr_def.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 #define CAMERA_STARTMV_RANGE (64)
 #define  ITERATIVE_TIMES  (16)
 #define CAMERA_MV_RANGE (CAMERA_STARTMV_RANGE+ITERATIVE_TIMES)
diff --git a/codec/encoder/core/inc/svc_set_mb_syn_cavlc.h b/codec/encoder/core/inc/svc_set_mb_syn_cavlc.h
index de2311fe..f1d133b9 100644
--- a/codec/encoder/core/inc/svc_set_mb_syn_cavlc.h
+++ b/codec/encoder/core/inc/svc_set_mb_syn_cavlc.h
@@ -48,7 +48,7 @@
 
 #include "set_mb_syn_cavlc.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 int32_t WelsWriteMbResidual (SWelsFuncPtrList* pFuncList, SMbCache* sMbCacheInfo, SMB* pCurMb, SBitStringAux* pBs);
 
diff --git a/codec/encoder/core/inc/vlc_encoder.h b/codec/encoder/core/inc/vlc_encoder.h
index 12212d26..02f505c5 100644
--- a/codec/encoder/core/inc/vlc_encoder.h
+++ b/codec/encoder/core/inc/vlc_encoder.h
@@ -40,7 +40,7 @@
 /* VLC FOR WELS ENCODER                                                 */
 /************************************************************************/
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 //g_kuiVlcCoeffToken[uiNc][total-coeff][trailing-ones][0--value, 1--bit count]
 extern const uint8_t g_kuiVlcCoeffToken[5][17][4][2];
diff --git a/codec/encoder/core/inc/wels_common_basis.h b/codec/encoder/core/inc/wels_common_basis.h
index d492f5e4..643bdbe6 100644
--- a/codec/encoder/core/inc/wels_common_basis.h
+++ b/codec/encoder/core/inc/wels_common_basis.h
@@ -43,7 +43,7 @@
 
 using namespace WelsCommon;
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 
 struct SMVUnitXY {			// each 4 Bytes
diff --git a/codec/encoder/core/inc/wels_func_ptr_def.h b/codec/encoder/core/inc/wels_func_ptr_def.h
index 79325459..6d9482e6 100644
--- a/codec/encoder/core/inc/wels_func_ptr_def.h
+++ b/codec/encoder/core/inc/wels_func_ptr_def.h
@@ -45,7 +45,7 @@
 #include "rc.h"
 #include "IWelsVP.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 typedef struct TagWelsFuncPointerList SWelsFuncPtrList;
 
@@ -289,6 +289,6 @@ struct TagWelsFuncPointerList {
   PCavlcParamCalFunc    pfCavlcParamCal;
 };
 
-}  //end of namespace WelsSVCEnc {
+}  //end of namespace WelsEnc {
 
 #endif//WELS_ENCODER_FUNCTION_POINTERS_DEFINITION_H_
diff --git a/codec/encoder/core/inc/wels_preprocess.h b/codec/encoder/core/inc/wels_preprocess.h
index 7f2da833..4acd29af 100644
--- a/codec/encoder/core/inc/wels_preprocess.h
+++ b/codec/encoder/core/inc/wels_preprocess.h
@@ -50,7 +50,7 @@
 #include "IWelsVP.h"
 #include "param_svc.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 typedef struct TagWelsEncCtx sWelsEncCtx;
 
diff --git a/codec/encoder/core/inc/wels_transpose_matrix.h b/codec/encoder/core/inc/wels_transpose_matrix.h
index b66e8a2c..38832e40 100644
--- a/codec/encoder/core/inc/wels_transpose_matrix.h
+++ b/codec/encoder/core/inc/wels_transpose_matrix.h
@@ -34,7 +34,7 @@
 
 #include "typedefs.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 #ifdef X86_ASM
 extern "C"
diff --git a/codec/encoder/core/src/au_set.cpp b/codec/encoder/core/src/au_set.cpp
index f5329e7e..0bc05975 100644
--- a/codec/encoder/core/src/au_set.cpp
+++ b/codec/encoder/core/src/au_set.cpp
@@ -41,7 +41,7 @@
 #include "au_set.h"
 #include "svc_enc_golomb.h"
 #include "macros.h"
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 
 #define LEVEL_NUMBER 16
@@ -501,4 +501,4 @@ int32_t WelsInitPps (SWelsPPS* pPps,
 
   return 0;
 }
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
diff --git a/codec/encoder/core/src/deblocking.cpp b/codec/encoder/core/src/deblocking.cpp
index 7728c704..aeae40d7 100644
--- a/codec/encoder/core/src/deblocking.cpp
+++ b/codec/encoder/core/src/deblocking.cpp
@@ -41,7 +41,7 @@
 #include "deblocking.h"
 #include "cpu_core.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 #define g_kuiAlphaTable(x) g_kuiAlphaTable[(x)]
 #define g_kiBetaTable(x)  g_kiBetaTable[(x)]
@@ -860,5 +860,5 @@ void  DeblockingInit (DeblockingFunc*   pFunc,  int32_t iCpu) {
 }
 
 
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
 
diff --git a/codec/encoder/core/src/decode_mb_aux.cpp b/codec/encoder/core/src/decode_mb_aux.cpp
index 76b5b79f..09119d3e 100644
--- a/codec/encoder/core/src/decode_mb_aux.cpp
+++ b/codec/encoder/core/src/decode_mb_aux.cpp
@@ -33,7 +33,7 @@
 #include "decode_mb_aux.h"
 #include "cpu_core.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 /****************************************************************************
  * Dequant and Ihdm functions
  ****************************************************************************/
diff --git a/codec/encoder/core/src/encode_mb_aux.cpp b/codec/encoder/core/src/encode_mb_aux.cpp
index 7a99df66..a542590c 100644
--- a/codec/encoder/core/src/encode_mb_aux.cpp
+++ b/codec/encoder/core/src/encode_mb_aux.cpp
@@ -34,7 +34,7 @@
 #include "ls_defines.h"
 #include "encode_mb_aux.h"
 #include "cpu_core.h"
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 ALIGNED_DECLARE (const int16_t, g_kiQuantInterFF[58][8], 16) = {
   /* 0*/ {   0,   1,   0,   1,   1,   1,   1,   1 },
diff --git a/codec/encoder/core/src/encoder.cpp b/codec/encoder/core/src/encoder.cpp
index a4e910ed..cf3ed6e9 100644
--- a/codec/encoder/core/src/encoder.cpp
+++ b/codec/encoder/core/src/encoder.cpp
@@ -55,7 +55,7 @@
 #include "slice_multi_threading.h"
 
 //  global   function  pointers  definition
-namespace WelsSVCEnc {
+namespace WelsEnc {
 /* Motion compensation */
 
 
diff --git a/codec/encoder/core/src/encoder_data_tables.cpp b/codec/encoder/core/src/encoder_data_tables.cpp
index d6d1fb0b..7fe572da 100644
--- a/codec/encoder/core/src/encoder_data_tables.cpp
+++ b/codec/encoder/core/src/encoder_data_tables.cpp
@@ -34,7 +34,7 @@
 // export date cross various modules (.c)
 #include "md.h"
 #include "vlc_encoder.h"
-namespace WelsSVCEnc {
+namespace WelsEnc {
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // extern at mb_cache.h
diff --git a/codec/encoder/core/src/encoder_ext.cpp b/codec/encoder/core/src/encoder_ext.cpp
index 8fe9a26d..844c23aa 100644
--- a/codec/encoder/core/src/encoder_ext.cpp
+++ b/codec/encoder/core/src/encoder_ext.cpp
@@ -55,7 +55,7 @@
 #include "slice_multi_threading.h"
 #include "measure_time.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 
 int32_t WelsCodeOnePicPartition (sWelsEncCtx* pCtx,
@@ -3997,4 +3997,4 @@ int32_t WelsCodeOnePicPartition (sWelsEncCtx* pCtx,
 
   return ENC_RETURN_SUCCESS;
 }
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
diff --git a/codec/encoder/core/src/get_intra_predictor.cpp b/codec/encoder/core/src/get_intra_predictor.cpp
index e418e204..5b9679bc 100644
--- a/codec/encoder/core/src/get_intra_predictor.cpp
+++ b/codec/encoder/core/src/get_intra_predictor.cpp
@@ -43,7 +43,7 @@
 #include "cpu_core.h"
 #include "get_intra_predictor.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 #define I4x4_COUNT 4
 #define I8x8_COUNT 8
 #define I16x16_COUNT 16
diff --git a/codec/encoder/core/src/mc.cpp b/codec/encoder/core/src/mc.cpp
index b54cbaa8..36cfd23e 100644
--- a/codec/encoder/core/src/mc.cpp
+++ b/codec/encoder/core/src/mc.cpp
@@ -41,7 +41,7 @@
 #include "mc.h"
 #include "cpu_core.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 /*------------------weight for chroma fraction pixel interpolation------------------*/
 //kuiA = (8 - dx) * (8 - dy);
 //kuiB = dx * (8 - dy);
diff --git a/codec/encoder/core/src/md.cpp b/codec/encoder/core/src/md.cpp
index 334c51c2..e0f6b423 100644
--- a/codec/encoder/core/src/md.cpp
+++ b/codec/encoder/core/src/md.cpp
@@ -43,7 +43,7 @@
 #include "cpu_core.h"
 #include "svc_enc_golomb.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 #define INTRA_VARIANCE_SAD_THRESHOLD 150
 #define INTER_VARIANCE_SAD_THRESHOLD 20
 
diff --git a/codec/encoder/core/src/memory_align.cpp b/codec/encoder/core/src/memory_align.cpp
index 6c9a1696..8160772a 100644
--- a/codec/encoder/core/src/memory_align.cpp
+++ b/codec/encoder/core/src/memory_align.cpp
@@ -35,7 +35,7 @@
 #include "memory_align.h"
 #include "macros.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 CMemoryAlign::CMemoryAlign (const uint32_t kuiCacheLineSize)
 #ifdef MEMORY_MONITOR
@@ -143,4 +143,4 @@ const uint32_t CMemoryAlign::WelsGetMemoryUsage() const {
   return m_nMemoryUsageInBytes;
 }
 
-} // end of namespace WelsSVCEnc
+} // end of namespace WelsEnc
diff --git a/codec/encoder/core/src/mv_pred.cpp b/codec/encoder/core/src/mv_pred.cpp
index f04b522c..57411007 100644
--- a/codec/encoder/core/src/mv_pred.cpp
+++ b/codec/encoder/core/src/mv_pred.cpp
@@ -40,7 +40,7 @@
 
 #include "mv_pred.h"
 #include "ls_defines.h"
-namespace WelsSVCEnc {
+namespace WelsEnc {
 //basic pMv prediction unit for pMv width (4, 2, 1)
 void PredMv (const SMVComponentUnit* kpMvComp, int8_t iPartIdx, int8_t iPartW, int32_t iRef, SMVUnitXY* sMvp) {
   const uint8_t kuiLeftIdx		= g_kuiCache30ScanIdx[iPartIdx] - 1;
@@ -359,4 +359,4 @@ void UpdateP8x8Motion2Cache (SMbCache* pMbCache, int32_t iPartIdx, int8_t pRef,
         pMvComp->sMotionVectorCache[7 + kuiCacheIdx] = *pMv;
 }
 
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
diff --git a/codec/encoder/core/src/nal_encap.cpp b/codec/encoder/core/src/nal_encap.cpp
index 32602254..51e0cd95 100644
--- a/codec/encoder/core/src/nal_encap.cpp
+++ b/codec/encoder/core/src/nal_encap.cpp
@@ -39,7 +39,7 @@
 #include "nal_encap.h"
 #include "svc_enc_golomb.h"
 #include "ls_defines.h"
-namespace WelsSVCEnc {
+namespace WelsEnc {
 /*!
  * \brief	load an initialize NAL pRawNal pData
  */
@@ -197,4 +197,4 @@ int32_t WelsWriteSVCPrefixNal (SBitStringAux* pBitStringAux, const int32_t kiNal
   return 0;
 }
 
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
diff --git a/codec/encoder/core/src/picture_handle.cpp b/codec/encoder/core/src/picture_handle.cpp
index 96ad7f1a..91246d12 100644
--- a/codec/encoder/core/src/picture_handle.cpp
+++ b/codec/encoder/core/src/picture_handle.cpp
@@ -39,7 +39,7 @@
 #include "picture_handle.h"
 #include "svc_motion_estimate.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 /*!
  * \brief	alloc picture pData with borders for each plane based width and height of picture
  * \param	cx				width of picture in pixels
@@ -194,5 +194,5 @@ void WelsExchangeSpatialPictures (SPicture** ppPic1, SPicture** ppPic2) {
   *ppPic2 = tmp;
 }
 
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
 
diff --git a/codec/encoder/core/src/property.cpp b/codec/encoder/core/src/property.cpp
index ed96dee4..781380b9 100644
--- a/codec/encoder/core/src/property.cpp
+++ b/codec/encoder/core/src/property.cpp
@@ -39,7 +39,7 @@
  */
 #include "property.h"
 #include "crt_util_safe_x.h"	// Safe CRT routines like utils for cross_platforms
-namespace WelsSVCEnc {
+namespace WelsEnc {
 #define WELS_CODE_NAME	"Wels"
 #define WELS_LIB_NAME	"Encoder"
 
@@ -136,4 +136,4 @@ int32_t GetIdentInfo (char* pBuf, int32_t iSize) {
   return iLen;
 }
 
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
diff --git a/codec/encoder/core/src/ratectl.cpp b/codec/encoder/core/src/ratectl.cpp
index 34337332..4005e50c 100644
--- a/codec/encoder/core/src/ratectl.cpp
+++ b/codec/encoder/core/src/ratectl.cpp
@@ -47,7 +47,7 @@
 #include "svc_enc_golomb.h"
 
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 //#define _TEST_TEMP_RC_
 #ifdef _TEST_TEMP_RC_
diff --git a/codec/encoder/core/src/ref_list_mgr_svc.cpp b/codec/encoder/core/src/ref_list_mgr_svc.cpp
index 3fa0a714..1f8355ea 100644
--- a/codec/encoder/core/src/ref_list_mgr_svc.cpp
+++ b/codec/encoder/core/src/ref_list_mgr_svc.cpp
@@ -34,7 +34,7 @@
 #include "ref_list_mgr_svc.h"
 #include "utils.h"
 #include "picture_handle.h"
-namespace WelsSVCEnc {
+namespace WelsEnc {
 /*
  *	set picture as unreferenced
  */
@@ -912,5 +912,5 @@ void InitRefListMgrFunc (SWelsFuncPtrList* pFuncList, EUsageType eUsageType) {
     pFuncList->pUpdateRefList =   WelsUpdateRefList;
   }
 }
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
 
diff --git a/codec/encoder/core/src/sample.cpp b/codec/encoder/core/src/sample.cpp
index 233b021f..e6005e23 100644
--- a/codec/encoder/core/src/sample.cpp
+++ b/codec/encoder/core/src/sample.cpp
@@ -44,7 +44,7 @@
 #include "mc.h"
 #include "cpu_core.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 int32_t WelsSampleSatd4x4_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {
   int32_t iSatdSum = 0;
   int32_t pSampleMix[4][4] = {{ 0 }};
@@ -443,4 +443,4 @@ void WelsInitSampleSadFunc (SWelsFuncPtrList* pFuncList, uint32_t uiCpuFlag) {
 #endif
 }
 
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
diff --git a/codec/encoder/core/src/set_mb_syn_cavlc.cpp b/codec/encoder/core/src/set_mb_syn_cavlc.cpp
index bbf491f5..8d0e010f 100644
--- a/codec/encoder/core/src/set_mb_syn_cavlc.cpp
+++ b/codec/encoder/core/src/set_mb_syn_cavlc.cpp
@@ -43,7 +43,7 @@
 #include "cpu_core.h"
 #include "wels_const.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 const  ALIGNED_DECLARE (uint8_t, g_kuiZeroLeftMap[16], 16) = {
   0, 1, 2, 3, 4, 5, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7
@@ -210,4 +210,4 @@ void InitCoeffFunc (SWelsFuncPtrList* pFuncList, const uint32_t uiCpuFlag) {
 #endif
 }
 
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
diff --git a/codec/encoder/core/src/slice_multi_threading.cpp b/codec/encoder/core/src/slice_multi_threading.cpp
index ec6bb516..5ca24daa 100644
--- a/codec/encoder/core/src/slice_multi_threading.cpp
+++ b/codec/encoder/core/src/slice_multi_threading.cpp
@@ -69,7 +69,7 @@
 #define MT_TRACE_LOG(x, ...)
 #endif
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 void UpdateMbListNeighborParallel (SSliceCtx* pSliceCtx,
                                    SMB* pMbList,
                                    const int32_t uiSliceIdc) {
diff --git a/codec/encoder/core/src/svc_base_layer_md.cpp b/codec/encoder/core/src/svc_base_layer_md.cpp
index a5c4ae41..c646514d 100644
--- a/codec/encoder/core/src/svc_base_layer_md.cpp
+++ b/codec/encoder/core/src/svc_base_layer_md.cpp
@@ -44,7 +44,7 @@
 #include "encoder.h"
 #include "svc_encode_mb.h"
 #include "svc_encode_slice.h"
-namespace WelsSVCEnc {
+namespace WelsEnc {
 static const ALIGNED_DECLARE (int8_t, g_kiIntra16AvaliMode[8][5], 16) = {
   { I16_PRED_DC_128, I16_PRED_INVALID, I16_PRED_INVALID, I16_PRED_INVALID, 1 },
   { I16_PRED_DC_L,   I16_PRED_H,       I16_PRED_INVALID, I16_PRED_INVALID, 2 },
@@ -1809,4 +1809,4 @@ void WelsMdIntraSecondaryModesEnc (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB*
   pCurMb->pSadCost[0] = 0;
 }
 
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
diff --git a/codec/encoder/core/src/svc_enc_slice_segment.cpp b/codec/encoder/core/src/svc_enc_slice_segment.cpp
index 48e537ff..35cb2c30 100644
--- a/codec/encoder/core/src/svc_enc_slice_segment.cpp
+++ b/codec/encoder/core/src/svc_enc_slice_segment.cpp
@@ -40,7 +40,7 @@
 #include <string.h>
 #include "rc.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 /*!
  * \brief	Assign MB map for single slice segment
  *
@@ -694,4 +694,4 @@ int32_t DynamicMaxSliceNumConstraint (uint32_t uiMaximumNum, int32_t iConsumedNu
   return ((uiMaximumNum - iConsumedNum - 1) / iDulplicateTimes);
 }
 
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
diff --git a/codec/encoder/core/src/svc_encode_mb.cpp b/codec/encoder/core/src/svc_encode_mb.cpp
index d0f15e2b..02a4ddd1 100644
--- a/codec/encoder/core/src/svc_encode_mb.cpp
+++ b/codec/encoder/core/src/svc_encode_mb.cpp
@@ -43,7 +43,7 @@
 #include "decode_mb_aux.h"
 #include "ls_defines.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 void WelsDctMb (int16_t* pRes, uint8_t* pEncMb, int32_t iEncStride, uint8_t* pBestPred, PDctFunc pfDctFourT4) {
   pfDctFourT4 (pRes,			    pEncMb,							    iEncStride, pBestPred,			16);
   pfDctFourT4 (pRes + 64,		pEncMb + 8,						    iEncStride, pBestPred + 8,		16);
@@ -383,4 +383,4 @@ bool    WelsTryPUVskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, i
   }
 }
 
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
diff --git a/codec/encoder/core/src/svc_encode_slice.cpp b/codec/encoder/core/src/svc_encode_slice.cpp
index 6a4bbbdd..c00a1b70 100644
--- a/codec/encoder/core/src/svc_encode_slice.cpp
+++ b/codec/encoder/core/src/svc_encode_slice.cpp
@@ -47,7 +47,7 @@
 #include "decode_mb_aux.h"
 #include "svc_mode_decision.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 //#define ENC_TRACE
 
 typedef int32_t (*PWelsCodingSliceFunc) (sWelsEncCtx* pCtx, SSlice* pSlice);
@@ -1146,4 +1146,4 @@ TRY_REENCODING:
   return iEncReturn;
 }
 
-}//namespace WelsSVCEnc
+}//namespace WelsEnc
diff --git a/codec/encoder/core/src/svc_mode_decision.cpp b/codec/encoder/core/src/svc_mode_decision.cpp
index 96b22c5b..f8dae41e 100644
--- a/codec/encoder/core/src/svc_mode_decision.cpp
+++ b/codec/encoder/core/src/svc_mode_decision.cpp
@@ -45,7 +45,7 @@
 #include "svc_base_layer_md.h"
 #include "svc_mode_decision.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 //////////////
 // MD for enhancement layers
@@ -662,4 +662,4 @@ void SetScrollingMvToMd (void* pVaa, void* pMd) {
 void SetScrollingMvToMdNull (void* pVaa, void* pWelsMd) {
 }
 
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
diff --git a/codec/encoder/core/src/svc_motion_estimate.cpp b/codec/encoder/core/src/svc_motion_estimate.cpp
index dd9fbd92..2c8c46a7 100644
--- a/codec/encoder/core/src/svc_motion_estimate.cpp
+++ b/codec/encoder/core/src/svc_motion_estimate.cpp
@@ -43,7 +43,7 @@
 #include "svc_motion_estimate.h"
 #include "wels_transpose_matrix.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 const int32_t QStepx16ByQp[52] = {  /* save QStep<<4 for int32_t */
   10,  11,  13,  14,  16,  18,  /* 0~5   */
@@ -1019,5 +1019,5 @@ void WelsDiamondCrossFeatureSearch (SWelsFuncPtrList* pFunc, SWelsME* pMe, SSlic
 }
 
 
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
 
diff --git a/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp b/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp
index ad13f5ee..8fd4b5c7 100644
--- a/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp
+++ b/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp
@@ -42,7 +42,7 @@
 #include "ls_defines.h"
 #include "svc_set_mb_syn_cavlc.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 const uint32_t g_kuiIntra4x4CbpMap[48] = {
   3, 29, 30, 17, 31, 18, 37,  8, 32, 38, 19,  9, 20, 10, 11, 2, //15
   16, 33, 34, 21, 35, 22, 39,  4, 36, 40, 23,  5, 24,  6,  7, 1, //31
@@ -369,4 +369,4 @@ int32_t WelsWriteMbResidual (SWelsFuncPtrList* pFuncList, SMbCache* sMbCacheInfo
   return 0;
 }
 
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
diff --git a/codec/encoder/core/src/wels_preprocess.cpp b/codec/encoder/core/src/wels_preprocess.cpp
index d05e8c9e..28fb4c7a 100644
--- a/codec/encoder/core/src/wels_preprocess.cpp
+++ b/codec/encoder/core/src/wels_preprocess.cpp
@@ -36,7 +36,7 @@
 #include "utils.h"
 #include "encoder.h"
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 #define WelsSafeDelete(p) if(p){ delete (p); (p) = NULL; }
 
@@ -1219,4 +1219,4 @@ void  CWelsPreProcess::WelsMoveMemoryWrapper (SWelsSvcCodingParam* pSvcParam, SP
 }
 
 //*********************************************************************************************************/
-} // namespace WelsSVCEnc
+} // namespace WelsEnc
diff --git a/codec/encoder/plus/inc/welsEncoderExt.h b/codec/encoder/plus/inc/welsEncoderExt.h
index 59ee4a3a..aa463deb 100644
--- a/codec/encoder/plus/inc/welsEncoderExt.h
+++ b/codec/encoder/plus/inc/welsEncoderExt.h
@@ -55,7 +55,7 @@
 //#define REC_FRAME_COUNT
 
 class ISVCEncoder;
-namespace WelsSVCEnc {
+namespace WelsEnc {
 class CWelsH264SVCEncoder : public ISVCEncoder {
  public:
   CWelsH264SVCEncoder();
diff --git a/codec/encoder/plus/src/welsEncoderExt.cpp b/codec/encoder/plus/src/welsEncoderExt.cpp
index 166d9ec4..f3b76a5e 100644
--- a/codec/encoder/plus/src/welsEncoderExt.cpp
+++ b/codec/encoder/plus/src/welsEncoderExt.cpp
@@ -52,7 +52,7 @@
 #include <sys/time.h>
 #endif
 
-namespace WelsSVCEnc {
+namespace WelsEnc {
 
 /*
  *	CWelsH264SVCEncoder class implementation
@@ -1102,7 +1102,7 @@ void CWelsH264SVCEncoder::DumpSrcPicture (const uint8_t* pSrc) {
 }
 }
 
-using namespace WelsSVCEnc;
+using namespace WelsEnc;
 
 int32_t WelsCreateSVCEncoder (ISVCEncoder** ppEncoder) {
   if ((*ppEncoder = new CWelsH264SVCEncoder()) != NULL) {
diff --git a/test/encoder/EncUT_DecodeMbAux.cpp b/test/encoder/EncUT_DecodeMbAux.cpp
index fa84dbc4..3b8d83a7 100644
--- a/test/encoder/EncUT_DecodeMbAux.cpp
+++ b/test/encoder/EncUT_DecodeMbAux.cpp
@@ -4,7 +4,7 @@
 #include "macros.h"
 #include "cpu.h"
 
-using namespace WelsSVCEnc;
+using namespace WelsEnc;
 
 
 TEST (DecodeMbAuxTest, TestIhdm_4x4_dc) {
diff --git a/test/encoder/EncUT_EncoderMb.cpp b/test/encoder/EncUT_EncoderMb.cpp
index 83ec3d19..454f6c77 100644
--- a/test/encoder/EncUT_EncoderMb.cpp
+++ b/test/encoder/EncUT_EncoderMb.cpp
@@ -3,7 +3,7 @@
 #include "memory_align.h"
 #include "utils/DataGenerator.h"
 
-using namespace WelsSVCEnc;
+using namespace WelsEnc;
 #include "encode_mb_aux.h"
 
 ALIGNED_DECLARE (const int16_t, g_kiQuantInterFFCompare[104][8], 16) = {
diff --git a/test/encoder/EncUT_EncoderMbAux.cpp b/test/encoder/EncUT_EncoderMbAux.cpp
index 12ac2707..c548f8b2 100644
--- a/test/encoder/EncUT_EncoderMbAux.cpp
+++ b/test/encoder/EncUT_EncoderMbAux.cpp
@@ -3,7 +3,7 @@
 #include "encode_mb_aux.h"
 #include "wels_common_basis.h"
 
-using namespace WelsSVCEnc;
+using namespace WelsEnc;
 
 #define ALLOC_MEMORY(type, name, num) type* name = (type*)cMemoryAlign.WelsMalloc(num*sizeof(type), #name);
 #define FREE_MEMORY(name) cMemoryAlign.WelsFree(name, #name);
diff --git a/test/encoder/EncUT_ExpGolomb.cpp b/test/encoder/EncUT_ExpGolomb.cpp
index 2a3a7874..9fdbd578 100644
--- a/test/encoder/EncUT_ExpGolomb.cpp
+++ b/test/encoder/EncUT_ExpGolomb.cpp
@@ -3,7 +3,7 @@
 #include "svc_enc_golomb.h"
 #include "macros.h"
 
-using namespace WelsSVCEnc;
+using namespace WelsEnc;
 
 const double g_kdLog2Factor = 1.0 / log (2.0);
 
diff --git a/test/encoder/EncUT_GetIntraPredictor.cpp b/test/encoder/EncUT_GetIntraPredictor.cpp
index 8aba057e..e85c8f62 100644
--- a/test/encoder/EncUT_GetIntraPredictor.cpp
+++ b/test/encoder/EncUT_GetIntraPredictor.cpp
@@ -5,7 +5,8 @@
 #include "ls_defines.h"
 #include "macros.h"
 
-using namespace WelsSVCEnc;
+using namespace WelsEnc;
+
 TEST (GetIntraPredictorTest, TestGetI4x4LumaPredV) {
   uint8_t* pPred = new uint8_t[64];
   uint8_t*	pRef  = new uint8_t[64];
diff --git a/test/encoder/EncUT_MBCopy.cpp b/test/encoder/EncUT_MBCopy.cpp
index 8acc2510..5e2f311f 100644
--- a/test/encoder/EncUT_MBCopy.cpp
+++ b/test/encoder/EncUT_MBCopy.cpp
@@ -10,7 +10,7 @@
 #include "wels_func_ptr_def.h"
 #include "copy_mb.h"
 
-using namespace WelsSVCEnc;
+using namespace WelsEnc;
 #define MBCOPYTEST_NUM 1000
 static void FillWithRandomData (uint8_t* p, int32_t Len) {
   for (int32_t i = 0; i < Len; i++) {
diff --git a/test/encoder/EncUT_MemoryAlloc.cpp b/test/encoder/EncUT_MemoryAlloc.cpp
index 1b3a8642..82b63210 100644
--- a/test/encoder/EncUT_MemoryAlloc.cpp
+++ b/test/encoder/EncUT_MemoryAlloc.cpp
@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 #include "memory_align.h"
 
-using namespace WelsSVCEnc;
+using namespace WelsEnc;
 
 //Tests of WelsGetCacheLineSize Begin
 TEST (MemoryAlignTest, GetCacheLineSize_LoopWithin16K) {
diff --git a/test/encoder/EncUT_MemoryZero.cpp b/test/encoder/EncUT_MemoryZero.cpp
index 620b45d4..86c6ecad 100644
--- a/test/encoder/EncUT_MemoryZero.cpp
+++ b/test/encoder/EncUT_MemoryZero.cpp
@@ -9,7 +9,7 @@
 #include "wels_func_ptr_def.h"
 #include "../../codec/encoder/core/src/encoder.cpp"
 
-using namespace WelsSVCEnc;
+using namespace WelsEnc;
 #define MEMORYZEROTEST_NUM 1000
 
 TEST (SetMemZeroFunTest, WelsSetMemZero) {
diff --git a/test/encoder/EncUT_MotionEstimate.cpp b/test/encoder/EncUT_MotionEstimate.cpp
index 164a85c8..ceb9af4b 100644
--- a/test/encoder/EncUT_MotionEstimate.cpp
+++ b/test/encoder/EncUT_MotionEstimate.cpp
@@ -7,7 +7,7 @@
 #include "wels_func_ptr_def.h"
 #include "cpu.h"
 
-using namespace WelsSVCEnc;
+using namespace WelsEnc;
 
 void CopyTargetBlock (uint8_t* pSrcBlock, const int32_t kiBlockSize, SMVUnitXY sTargetMv, const int32_t kiRefPicStride,
                       uint8_t* pRefPic) {
diff --git a/test/encoder/EncUT_Reconstruct.cpp b/test/encoder/EncUT_Reconstruct.cpp
index 5aa8ba9a..818b02d7 100644
--- a/test/encoder/EncUT_Reconstruct.cpp
+++ b/test/encoder/EncUT_Reconstruct.cpp
@@ -10,7 +10,7 @@
 #include "decode_mb_aux.h"
 #include "wels_func_ptr_def.h"
 
-using namespace WelsSVCEnc;
+using namespace WelsEnc;
 #define RECONTEST_NUM 1000
 static void FillWithRandomData (uint8_t* p, int32_t Len) {
   for (int32_t i = 0; i < Len; i++) {
diff --git a/test/encoder/EncUT_SVC_me.cpp b/test/encoder/EncUT_SVC_me.cpp
index ea93ff8c..0646d25f 100644
--- a/test/encoder/EncUT_SVC_me.cpp
+++ b/test/encoder/EncUT_SVC_me.cpp
@@ -8,7 +8,7 @@
 #include "macros.h"
 #include "svc_motion_estimate.h"
 
-using namespace WelsSVCEnc;
+using namespace WelsEnc;
 #define SVC_ME_TEST_NUM 10
 static void FillWithRandomData (uint8_t* p, int32_t Len) {
   for (int32_t i = 0; i < Len; i++) {
diff --git a/test/encoder/EncUT_Sample.cpp b/test/encoder/EncUT_Sample.cpp
index 6e760a79..e02ce026 100644
--- a/test/encoder/EncUT_Sample.cpp
+++ b/test/encoder/EncUT_Sample.cpp
@@ -7,7 +7,7 @@
 #include "sad_common.h"
 #include "get_intra_predictor.h"
 
-using namespace WelsSVCEnc;
+using namespace WelsEnc;
 #ifdef X86_ASM
 TEST (IntraSadSatdFuncTest, WelsIntra16x16Combined3Sad_ssse3) {
   const int32_t iLineSizeDec = 32;