diff --git a/openmax/Android.mk b/openmax/Android.mk
index af59183..a90f254 100644
--- a/openmax/Android.mk
+++ b/openmax/Android.mk
@@ -25,10 +25,10 @@ EXYNOS_VIDEO_CODEC := \
 ifeq ($(BOARD_USE_ALP_AUDIO), true)
     ifeq ($(BOARD_USE_SEIREN_AUDIO), true)
     EXYNOS_AUDIO_CODEC += \
-        hardware/samsung_slsi/exynos/libseiren
+        hardware/samsung_slsi-linaro/exynos/libseiren
     else
     EXYNOS_AUDIO_CODEC += \
-        hardware/samsung_slsi/exynos/libsrp
+        hardware/samsung_slsi-linaro/exynos/libsrp
     endif
 endif
 
diff --git a/openmax/component/video/dec/Android.mk b/openmax/component/video/dec/Android.mk
index a4ecf60..f34c239 100644
--- a/openmax/component/video/dec/Android.mk
+++ b/openmax/component/video/dec/Android.mk
@@ -17,7 +17,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/dec \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 LOCAL_STATIC_LIBRARIES := libExynosVideoApi libVendorVideoApi libExynosOMX_OSAL
 LOCAL_SHARED_LIBRARIES := liblog
diff --git a/openmax/component/video/dec/h264/Android.mk b/openmax/component/video/dec/h264/Android.mk
index 08bc301..814bd0b 100644
--- a/openmax/component/video/dec/h264/Android.mk
+++ b/openmax/component/video/dec/h264/Android.mk
@@ -66,7 +66,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/dec \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 ifeq ($(BOARD_USE_SKYPE_HD), true)
 LOCAL_CFLAGS += -DUSE_SKYPE_HD
diff --git a/openmax/component/video/dec/hevc/Android.mk b/openmax/component/video/dec/hevc/Android.mk
index da9fa83..aee0322 100644
--- a/openmax/component/video/dec/hevc/Android.mk
+++ b/openmax/component/video/dec/hevc/Android.mk
@@ -71,7 +71,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/dec \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/dec/mpeg2/Android.mk b/openmax/component/video/dec/mpeg2/Android.mk
index 0ce8110..05e2cd5 100644
--- a/openmax/component/video/dec/mpeg2/Android.mk
+++ b/openmax/component/video/dec/mpeg2/Android.mk
@@ -62,7 +62,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/dec \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/dec/mpeg4/Android.mk b/openmax/component/video/dec/mpeg4/Android.mk
index 4e37fb4..6ac44c1 100644
--- a/openmax/component/video/dec/mpeg4/Android.mk
+++ b/openmax/component/video/dec/mpeg4/Android.mk
@@ -62,7 +62,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/dec \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/dec/vc1/Android.mk b/openmax/component/video/dec/vc1/Android.mk
index 5a884a2..a0e3a05 100644
--- a/openmax/component/video/dec/vc1/Android.mk
+++ b/openmax/component/video/dec/vc1/Android.mk
@@ -62,7 +62,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/dec \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/dec/vp8/Android.mk b/openmax/component/video/dec/vp8/Android.mk
index 562967a..4d66433 100644
--- a/openmax/component/video/dec/vp8/Android.mk
+++ b/openmax/component/video/dec/vp8/Android.mk
@@ -63,7 +63,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/dec \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/dec/vp9/Android.mk b/openmax/component/video/dec/vp9/Android.mk
index 2bd4a45..0684dfa 100644
--- a/openmax/component/video/dec/vp9/Android.mk
+++ b/openmax/component/video/dec/vp9/Android.mk
@@ -63,7 +63,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/dec \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/enc/Android.mk b/openmax/component/video/enc/Android.mk
index 80d558e..aa47635 100644
--- a/openmax/component/video/enc/Android.mk
+++ b/openmax/component/video/enc/Android.mk
@@ -17,7 +17,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/enc \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/enc/h264/Android.mk b/openmax/component/video/enc/h264/Android.mk
index df65723..920232d 100644
--- a/openmax/component/video/enc/h264/Android.mk
+++ b/openmax/component/video/enc/h264/Android.mk
@@ -58,7 +58,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/enc \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 ifeq ($(BOARD_USE_SKYPE_HD), true)
 LOCAL_CFLAGS += -DUSE_SKYPE_HD
diff --git a/openmax/component/video/enc/h264wfd/Android.mk b/openmax/component/video/enc/h264wfd/Android.mk
index ddc5220..171c057 100644
--- a/openmax/component/video/enc/h264wfd/Android.mk
+++ b/openmax/component/video/enc/h264wfd/Android.mk
@@ -53,7 +53,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/enc \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/enc/hevc/Android.mk b/openmax/component/video/enc/hevc/Android.mk
index 33af2c3..ed66fd1 100644
--- a/openmax/component/video/enc/hevc/Android.mk
+++ b/openmax/component/video/enc/hevc/Android.mk
@@ -63,7 +63,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/enc \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/enc/hevcwfd/Android.mk b/openmax/component/video/enc/hevcwfd/Android.mk
index 281aa63..57c452c 100644
--- a/openmax/component/video/enc/hevcwfd/Android.mk
+++ b/openmax/component/video/enc/hevcwfd/Android.mk
@@ -53,7 +53,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/enc \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/enc/mpeg4/Android.mk b/openmax/component/video/enc/mpeg4/Android.mk
index 84962e6..bdb18d8 100644
--- a/openmax/component/video/enc/mpeg4/Android.mk
+++ b/openmax/component/video/enc/mpeg4/Android.mk
@@ -58,7 +58,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/enc \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/enc/vp8/Android.mk b/openmax/component/video/enc/vp8/Android.mk
index 4187d2a..8a6d1de 100644
--- a/openmax/component/video/enc/vp8/Android.mk
+++ b/openmax/component/video/enc/vp8/Android.mk
@@ -59,7 +59,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/enc \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/component/video/enc/vp9/Android.mk b/openmax/component/video/enc/vp9/Android.mk
index c2b51e2..7fccedf 100644
--- a/openmax/component/video/enc/vp9/Android.mk
+++ b/openmax/component/video/enc/vp9/Android.mk
@@ -58,7 +58,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/common \
 	$(EXYNOS_OMX_COMPONENT)/video/enc \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
diff --git a/openmax/osal/Android.mk b/openmax/osal/Android.mk
index 823ad36..ab81474 100644
--- a/openmax/osal/Android.mk
+++ b/openmax/osal/Android.mk
@@ -28,7 +28,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/video/enc \
 	$(EXYNOS_OMX_COMPONENT)/video/enc/h264 \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
@@ -73,7 +73,7 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/video/dec \
 	$(EXYNOS_OMX_COMPONENT)/video/dec/h264 \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
 LOCAL_CFLAGS += -DUSE_KHRONOS_OMX_HEADER
@@ -169,8 +169,8 @@ LOCAL_C_INCLUDES := \
 	$(EXYNOS_OMX_COMPONENT)/video/dec \
 	$(EXYNOS_OMX_COMPONENT)/video/enc \
 	$(EXYNOS_VIDEO_CODEC)/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
-	$(TOP)/hardware/samsung_slsi/exynos/libion/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/libion/include \
 	$(TOP)/system/core/libsystem/include/
 
 ifeq ($(BOARD_USE_ANDROID), true)
diff --git a/videocodec/Android.mk b/videocodec/Android.mk
index a1a97a0..3cb3fa9 100644
--- a/videocodec/Android.mk
+++ b/videocodec/Android.mk
@@ -11,14 +11,14 @@ LOCAL_SRC_FILES := \
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/include \
 	$(LOCAL_PATH)/osal/include \
-	$(TOP)/hardware/samsung_slsi/exynos/include \
+	$(TOP)/hardware/samsung_slsi-linaro/exynos/include \
 
 LOCAL_SHARED_LIBRARIES := libion_exynos
 
 LOCAL_SHARED_LIBRARIES += liblog
 
 ifeq ($(BOARD_USE_KHRONOS_OMX_HEADER), true)
-LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi/openmax/include/khronos
+LOCAL_C_INCLUDES += $(TOP)/hardware/samsung_slsi-linaro/openmax/include/khronos
 else
 LOCAL_HEADER_LIBRARIES := media_plugin_headers
 endif