diff --git a/XilinxProcessorIPLib/drivers/dptxss/src/Makefile b/XilinxProcessorIPLib/drivers/dptxss/src/Makefile
index ac6a65cf..2e6ddd46 100644
--- a/XilinxProcessorIPLib/drivers/dptxss/src/Makefile
+++ b/XilinxProcessorIPLib/drivers/dptxss/src/Makefile
@@ -17,7 +17,7 @@ OUTS = *.o
 INCLUDEFILES=*.h ./vtc/*.h ./dualsplitter/*.h ./dp/*.h
 LIBSOURCES=*.c ./vtc/*.c ./dualsplitter/*.c ./dp/*.c
 
-OBJECTS = $(addsuffix .o, $(basename ./vtc/xss_vtc.c ./dualsplitter/xss_dualsplitter.c ./dp/xss_dptx.c $(wildcard *.c)))
+OBJECTS = $(addsuffix .o, $(basename ./vtc/xdptxss_vtc.c ./dualsplitter/xdptxss_dualsplitter.c ./dp/xdptxss_dptx.c $(wildcard *.c)))
 
 libs: banner xdptxss_libs clean
 
diff --git a/XilinxProcessorIPLib/drivers/dptxss/src/dp/xss_dptx.c b/XilinxProcessorIPLib/drivers/dptxss/src/dp/xdptxss_dptx.c
similarity index 97%
rename from XilinxProcessorIPLib/drivers/dptxss/src/dp/xss_dptx.c
rename to XilinxProcessorIPLib/drivers/dptxss/src/dp/xdptxss_dptx.c
index c830e4c4..625496e7 100644
--- a/XilinxProcessorIPLib/drivers/dptxss/src/dp/xss_dptx.c
+++ b/XilinxProcessorIPLib/drivers/dptxss/src/dp/xdptxss_dptx.c
@@ -32,7 +32,7 @@
 /*****************************************************************************/
 /**
 *
-* @file xss_dptx.c
+* @file xdptxss_dptx.c
 *
 * This file contains a minimal set of functions for the DisplayPort core
 * to configure in TX mode of operation.
@@ -43,13 +43,15 @@
 * Ver  Who Date     Changes
 * ---- --- -------- --------------------------------------------------
 * 1.00 sha 01/29/15 Initial release.
+* 1.00 sha 07/21/15 Renamed file name with prefix xdptxss_* and function
+*                   names with prefix XDpTxSs_*.
 * </pre>
 *
 ******************************************************************************/
 
 /***************************** Include Files *********************************/
 
-#include "xss_dptx.h"
+#include "xdptxss_dptx.h"
 #include "xvidc.h"
 #include "xvidc_edid.h"
 #include "xdebug.h"
@@ -103,7 +105,7 @@ static XVidC_VideoMode Dp_GetPreferredVm(u8 *EdidPtr);
 * @note		None.
 *
 ******************************************************************************/
-u32 XSs_DpTxStart(XDp *InstancePtr, u8 TransportMode, u8 Bpc,
+u32 XDpTxSs_DpTxStart(XDp *InstancePtr, u8 TransportMode, u8 Bpc,
 			XVidC_VideoMode VidMode)
 {
 	u32 Status;
@@ -114,8 +116,8 @@ u32 XSs_DpTxStart(XDp *InstancePtr, u8 TransportMode, u8 Bpc,
 
 	/* Verify arguments. */
 	Xil_AssertNonvoid(InstancePtr != NULL);
-	Xil_AssertNonvoid((TransportMode == XSS_DPTX_MST) ||
-			(TransportMode == XSS_DPTX_SST));
+	Xil_AssertNonvoid((TransportMode == XDPTXSS_DPTX_MST) ||
+			(TransportMode == XDPTXSS_DPTX_SST));
 	Xil_AssertNonvoid((Bpc == XVIDC_BPC_8) || (Bpc == XVIDC_BPC_10) ||
 			(Bpc == XVIDC_BPC_12) || (Bpc == XVIDC_BPC_16));
 	Xil_AssertNonvoid((VidMode < XVIDC_VM_NUM_SUPPORTED) ||
@@ -167,13 +169,13 @@ u32 XSs_DpTxStart(XDp *InstancePtr, u8 TransportMode, u8 Bpc,
 		 * count. Training is required to discover topology so that
 		 * prefer erred timing can be known.
 		 */
-		Status = XSs_DpTxStartLink(InstancePtr, FALSE);
+		Status = XDpTxSs_DpTxStartLink(InstancePtr, FALSE);
 		if (Status != XST_SUCCESS) {
 			xdbg_printf(XDBG_DEBUG_GENERAL,"SS INFO:MST:Re- "
 				"training with maximum RX capabilities\n\r");
 
 			/* Train link with maximum RX capabilities */
-			Status = XSs_DpTxStartLink(InstancePtr, TRUE);
+			Status = XDpTxSs_DpTxStartLink(InstancePtr, TRUE);
 			if (Status != XST_SUCCESS) {
 				xdbg_printf(XDBG_DEBUG_GENERAL,"SS ERR:MST:"
 					"Verify cable and/or monitor.\n\r");
@@ -301,7 +303,7 @@ u32 XSs_DpTxStart(XDp *InstancePtr, u8 TransportMode, u8 Bpc,
 			/* Check for link training need and run training
 			 * sequence.
 			 */
-			Status = XSs_DpTxStartLink(InstancePtr, TRUE);
+			Status = XDpTxSs_DpTxStartLink(InstancePtr, TRUE);
 			if (Status != XST_SUCCESS) {
 				xdbg_printf(XDBG_DEBUG_GENERAL,"SS INFO:MST:"
 					"Re-training with max after payload "
@@ -444,14 +446,14 @@ u32 XSs_DpTxStart(XDp *InstancePtr, u8 TransportMode, u8 Bpc,
 		/* Start link training with user set link rate and lane
 		 * count.
 		 */
-		Status = XSs_DpTxStartLink(InstancePtr, FALSE);
+		Status = XDpTxSs_DpTxStartLink(InstancePtr, FALSE);
 		if (Status != XST_SUCCESS) {
 			xdbg_printf(XDBG_DEBUG_GENERAL,"SS INFO:SST:"
 				"Re-training with maximum RX capabilities."
 					"\n\r");
 
 			/* Train link with maximum RX capabilities */
-			Status = XSs_DpTxStartLink(InstancePtr, TRUE);
+			Status = XDpTxSs_DpTxStartLink(InstancePtr, TRUE);
 			if (Status != XST_SUCCESS) {
 				xdbg_printf(XDBG_DEBUG_GENERAL,"SS ERR:SST:"
 					"Verify cable and/or monitor.\n\r");
@@ -517,7 +519,7 @@ u32 XSs_DpTxStart(XDp *InstancePtr, u8 TransportMode, u8 Bpc,
 			/* Check for link training need and run training
 			 * sequence.
 			 */
-			Status = XSs_DpTxStartLink(InstancePtr, TRUE);
+			Status = XDpTxSs_DpTxStartLink(InstancePtr, TRUE);
 			if (Status != XST_SUCCESS) {
 				xdbg_printf(XDBG_DEBUG_GENERAL,"SS INFO:SST:"
 					"Re-training failed with max "
@@ -611,7 +613,7 @@ u32 XSs_DpTxStart(XDp *InstancePtr, u8 TransportMode, u8 Bpc,
 * @note		None.
 *
 ******************************************************************************/
-u32 XSs_DpTxStartLink(XDp *InstancePtr, u8 TrainMaxCap)
+u32 XDpTxSs_DpTxStartLink(XDp *InstancePtr, u8 TrainMaxCap)
 {
 	u32 Status;
 	u32 IntrMask;
diff --git a/XilinxProcessorIPLib/drivers/dptxss/src/dp/xss_dptx.h b/XilinxProcessorIPLib/drivers/dptxss/src/dp/xdptxss_dptx.h
similarity index 84%
rename from XilinxProcessorIPLib/drivers/dptxss/src/dp/xss_dptx.h
rename to XilinxProcessorIPLib/drivers/dptxss/src/dp/xdptxss_dptx.h
index f741f149..9f7a1bcc 100644
--- a/XilinxProcessorIPLib/drivers/dptxss/src/dp/xss_dptx.h
+++ b/XilinxProcessorIPLib/drivers/dptxss/src/dp/xdptxss_dptx.h
@@ -32,7 +32,7 @@
 /*****************************************************************************/
 /**
 *
-* @file xss_dptx.h
+* @file xdptxss_dptx.h
 *
 * This is the header file for Xilinx DisplayPort Transmitter Subsystem
 * sub-core, is DisplayPort in TX mode of operation.
@@ -43,11 +43,14 @@
 * Ver  Who Date     Changes
 * ---- --- -------- --------------------------------------------------
 * 1.00 sha 01/29/15 Initial release.
+* 1.00 sha 07/21/15 Renamed file name with prefix xdptxss_*, function
+*                   names with prefix XDpTxSs_* and macros with prefix
+*                   XDPTXSS_*
 * </pre>
 *
 ******************************************************************************/
-#ifndef XSS_DPTX_H_
-#define XSS_DPTX_H_		/**< Prevent circular inclusions
+#ifndef XDPTXSS_DPTX_H_
+#define XDPTXSS_DPTX_H_		/**< Prevent circular inclusions
 				  *  by using protection macros */
 
 #ifdef __cplusplus
@@ -60,8 +63,8 @@ extern "C" {
 
 /************************** Constant Definitions *****************************/
 
-#define XSS_DPTX_MST		1	/**< Multi-Stream Transport */
-#define XSS_DPTX_SST		0	/**< Single Stream Transport */
+#define XDPTXSS_DPTX_MST	1	/**< Multi-Stream Transport */
+#define XDPTXSS_DPTX_SST	0	/**< Single Stream Transport */
 
 /**************************** Type Definitions *******************************/
 
@@ -71,9 +74,9 @@ extern "C" {
 
 /************************** Function Prototypes ******************************/
 
-u32 XSs_DpTxStart(XDp *InstancePtr, u8 TransportMode, u8 Bpc,
+u32 XDpTxSs_DpTxStart(XDp *InstancePtr, u8 TransportMode, u8 Bpc,
 			XVidC_VideoMode VidMode);
-u32 XSs_DpTxStartLink(XDp *InstancePtr, u8 TrainMaxCap);
+u32 XDpTxSs_DpTxStartLink(XDp *InstancePtr, u8 TrainMaxCap);
 
 /************************** Variable Declarations ****************************/
 
diff --git a/XilinxProcessorIPLib/drivers/dptxss/src/dualsplitter/xss_dualsplitter.c b/XilinxProcessorIPLib/drivers/dptxss/src/dualsplitter/xdptxss_dualsplitter.c
similarity index 94%
rename from XilinxProcessorIPLib/drivers/dptxss/src/dualsplitter/xss_dualsplitter.c
rename to XilinxProcessorIPLib/drivers/dptxss/src/dualsplitter/xdptxss_dualsplitter.c
index 80d9d0a7..2ca33609 100644
--- a/XilinxProcessorIPLib/drivers/dptxss/src/dualsplitter/xss_dualsplitter.c
+++ b/XilinxProcessorIPLib/drivers/dptxss/src/dualsplitter/xdptxss_dualsplitter.c
@@ -32,7 +32,7 @@
 /*****************************************************************************/
 /**
 *
-* @file xss_dualsplitter.c
+* @file xdptxss_dualsplitter.c
 *
 * This file contains a minimal set of functions for the Dual Splitter core
 * to configure.
@@ -43,13 +43,15 @@
 * Ver  Who Date     Changes
 * ---- --- -------- --------------------------------------------------
 * 1.00 sha 01/29/15 Initial release.
+* 1.00 sha 07/21/15 Renamed file name with prefix xdptxss_* and function
+*                   name with prefix XDpTxSs_*.
 * </pre>
 *
 ******************************************************************************/
 
 /***************************** Include Files *********************************/
 
-#include "xss_dualsplitter.h"
+#include "xdptxss_dualsplitter.h"
 
 /************************** Constant Definitions *****************************/
 
@@ -87,7 +89,7 @@
 * @note		None.
 *
 ******************************************************************************/
-u32 XSs_DsSetup(XDualSplitter *InstancePtr, u8 VertSplit,
+u32 XDpTxSs_DsSetup(XDualSplitter *InstancePtr, u8 VertSplit,
 				XDp_TxMainStreamAttributes *MsaConfig)
 {
 	u8 ISamples;
diff --git a/XilinxProcessorIPLib/drivers/dptxss/src/dualsplitter/xss_dualsplitter.h b/XilinxProcessorIPLib/drivers/dptxss/src/dualsplitter/xdptxss_dualsplitter.h
similarity index 90%
rename from XilinxProcessorIPLib/drivers/dptxss/src/dualsplitter/xss_dualsplitter.h
rename to XilinxProcessorIPLib/drivers/dptxss/src/dualsplitter/xdptxss_dualsplitter.h
index 164d270e..d1830425 100644
--- a/XilinxProcessorIPLib/drivers/dptxss/src/dualsplitter/xss_dualsplitter.h
+++ b/XilinxProcessorIPLib/drivers/dptxss/src/dualsplitter/xdptxss_dualsplitter.h
@@ -43,12 +43,14 @@
 * Ver  Who Date     Changes
 * ---- --- -------- --------------------------------------------------
 * 1.00 sha 01/29/15 Initial release.
+* 1.00 sha 07/21/15 Renamed file name with prefix xdptxss_* and function
+*                   name with prefix XDpTxSs_*
 * </pre>
 *
 ******************************************************************************/
-#ifndef XSS_DUALSPLITTER_H_
-#define XSS_DUALSPLITTER_H_	/**< Prevent circular inclusions
-				  *  by using protection macros */
+#ifndef XDPTXSS_DUALSPLITTER_H_
+#define XDPTXSS_DUALSPLITTER_H_		/**< Prevent circular inclusions
+					  *  by using protection macros */
 
 #ifdef __cplusplus
 extern "C" {
@@ -74,7 +76,7 @@ extern "C" {
 /************************** Function Prototypes ******************************/
 
 #if (XPAR_XDUALSPLITTER_NUM_INSTANCES > 0)
-u32 XSs_DsSetup(XDualSplitter *InstancePtr, u8 NumStreams,
+u32 XDpTxSs_DsSetup(XDualSplitter *InstancePtr, u8 NumStreams,
 			XDp_TxMainStreamAttributes *MsaConfig);
 #endif
 
diff --git a/XilinxProcessorIPLib/drivers/dptxss/src/vtc/xss_vtc.c b/XilinxProcessorIPLib/drivers/dptxss/src/vtc/xdptxss_vtc.c
similarity index 96%
rename from XilinxProcessorIPLib/drivers/dptxss/src/vtc/xss_vtc.c
rename to XilinxProcessorIPLib/drivers/dptxss/src/vtc/xdptxss_vtc.c
index 2e6300b2..23c13959 100644
--- a/XilinxProcessorIPLib/drivers/dptxss/src/vtc/xss_vtc.c
+++ b/XilinxProcessorIPLib/drivers/dptxss/src/vtc/xdptxss_vtc.c
@@ -32,7 +32,7 @@
 /*****************************************************************************/
 /**
 *
-* @file xss_vtc.c
+* @file xdptxss_vtc.c
 *
 * This file contains a minimal set of functions for the Video Timing controller
 * core to configure.
@@ -43,13 +43,15 @@
 * Ver  Who Date     Changes
 * ---- --- -------- --------------------------------------------------
 * 1.00 sha 01/29/15 Initial release.
+* 1.00 sha 07/21/15 Renamed file name with prefix xdptxss_* and function
+*                   name with prefix XDpTxSs_*
 * </pre>
 *
 ******************************************************************************/
 
 /***************************** Include Files *********************************/
 
-#include "xss_vtc.h"
+#include "xdptxss_vtc.h"
 #include "string.h"
 
 /************************** Constant Definitions *****************************/
@@ -85,7 +87,7 @@
 * @note		None.
 *
 ******************************************************************************/
-u32 XSs_VtcSetup(XVtc *InstancePtr, XDp_TxMainStreamAttributes *MsaConfig)
+u32 XDpTxSs_VtcSetup(XVtc *InstancePtr, XDp_TxMainStreamAttributes *MsaConfig)
 {
 	u32 UserPixelWidth;
 
diff --git a/XilinxProcessorIPLib/drivers/dptxss/src/vtc/xss_vtc.h b/XilinxProcessorIPLib/drivers/dptxss/src/vtc/xdptxss_vtc.h
similarity index 90%
rename from XilinxProcessorIPLib/drivers/dptxss/src/vtc/xss_vtc.h
rename to XilinxProcessorIPLib/drivers/dptxss/src/vtc/xdptxss_vtc.h
index fd011a1e..08292a5e 100644
--- a/XilinxProcessorIPLib/drivers/dptxss/src/vtc/xss_vtc.h
+++ b/XilinxProcessorIPLib/drivers/dptxss/src/vtc/xdptxss_vtc.h
@@ -32,7 +32,7 @@
 /*****************************************************************************/
 /**
 *
-* @file xss_vtc.h
+* @file xdptxss_vtc.h
 *
 * This is the header file for Xilinx DisplayPort Transmitter Subsystem
 * sub-core, is Video Timing Controller.
@@ -43,11 +43,13 @@
 * Ver  Who Date     Changes
 * ---- --- -------- --------------------------------------------------
 * 1.00 sha 01/29/15 Initial release.
+* 1.00 sha 07/21/15 Renamed file name with prefix xdptxss_* and function
+*                   name with prefix XDpTxSs_*
 * </pre>
 *
 ******************************************************************************/
-#ifndef XSS_VTC_H_
-#define XSS_VTC_H_		/**< Prevent circular inclusions
+#ifndef XDPTXSS_VTC_H_
+#define XDPTXSS_VTC_H_		/**< Prevent circular inclusions
 				  *  by using protection macros */
 
 #ifdef __cplusplus
@@ -70,7 +72,7 @@ extern "C" {
 
 /************************** Function Prototypes ******************************/
 
-u32 XSs_VtcSetup(XVtc *InstancePtr, XDp_TxMainStreamAttributes *MsaConfig);
+u32 XDpTxSs_VtcSetup(XVtc *InstancePtr, XDp_TxMainStreamAttributes *MsaConfig);
 
 /************************** Variable Declarations ****************************/
 
diff --git a/XilinxProcessorIPLib/drivers/dptxss/src/xdptxss.c b/XilinxProcessorIPLib/drivers/dptxss/src/xdptxss.c
index 4f3c6610..ef5d75ea 100644
--- a/XilinxProcessorIPLib/drivers/dptxss/src/xdptxss.c
+++ b/XilinxProcessorIPLib/drivers/dptxss/src/xdptxss.c
@@ -45,6 +45,7 @@
 * Ver  Who Date     Changes
 * ---- --- -------- --------------------------------------------------
 * 1.00 sha 01/29/15 Initial release.
+* 1.00 sha 07/21/15 Renamed sub-cores functions with prefix XDpTxSs_*
 * </pre>
 *
 ******************************************************************************/
@@ -100,7 +101,7 @@ XDpTxSs_SubCores DpTxSsSubCores;
 * @return
 *		- XST_DEVICE_NOT_FOUND if sub-core not found.
 *		- XST_FAILURE if sub-core initialization failed.
-*		- XST_SUCCESS if XDptxss_CfgInitialize successful.
+*		- XST_SUCCESS if XDpTxSs_CfgInitialize successful.
 *
 * @note		None.
 *
@@ -353,7 +354,7 @@ u32 XDpTxSs_Start(XDpTxSs *InstancePtr)
 	}
 
 	/* Start DisplayPort sub-core configuration */
-	Status = XSs_DpTxStart(InstancePtr->DpPtr,
+	Status = XDpTxSs_DpTxStart(InstancePtr->DpPtr,
 			InstancePtr->UsrOpt.MstSupport,
 				InstancePtr->UsrOpt.Bpc,
 					InstancePtr->UsrOpt.VmId);
@@ -394,7 +395,7 @@ u32 XDpTxSs_Start(XDpTxSs *InstancePtr)
 		}
 
 		/* Setup Dual Splitter in either bypass/vertical split mode */
-		Status = XSs_DsSetup(InstancePtr->DsPtr, VertSplit,
+		Status = XDpTxSs_DsSetup(InstancePtr->DsPtr, VertSplit,
 				&InstancePtr->DpPtr->TxInstance.MsaConfig[0]);
 		if (Status != XST_SUCCESS) {
 			xdbg_printf(XDBG_DEBUG_GENERAL,"SS ERR: DS start "
@@ -407,7 +408,7 @@ u32 XDpTxSs_Start(XDpTxSs *InstancePtr)
 	/* Setup VTC */
 	for (Index = 0; Index < InstancePtr->UsrOpt.NumOfStreams; Index++) {
 		if (InstancePtr->VtcPtr[Index]) {
-			Status = XSs_VtcSetup(InstancePtr->VtcPtr[Index],
+			Status = XDpTxSs_VtcSetup(InstancePtr->VtcPtr[Index],
 			&InstancePtr->DpPtr->TxInstance.MsaConfig[Index]);
 			if (Status != XST_SUCCESS) {
 				xdbg_printf(XDBG_DEBUG_GENERAL,"SS ERR: "
diff --git a/XilinxProcessorIPLib/drivers/dptxss/src/xdptxss.h b/XilinxProcessorIPLib/drivers/dptxss/src/xdptxss.h
index c00b5490..dae5c9e3 100644
--- a/XilinxProcessorIPLib/drivers/dptxss/src/xdptxss.h
+++ b/XilinxProcessorIPLib/drivers/dptxss/src/xdptxss.h
@@ -90,6 +90,7 @@
 * Ver  Who Date     Changes
 * ---- --- -------- --------------------------------------------------
 * 1.00 sha 01/29/15 Initial release.
+* 1.00 sha 07/21/15 Included renamed sub-cores header files.
 * </pre>
 *
 ******************************************************************************/
@@ -110,9 +111,9 @@ extern "C" {
 #include "xdebug.h"
 
 /* Subsystem sub-cores header files */
-#include "xss_dptx.h"
-#include "xss_dualsplitter.h"
-#include "xss_vtc.h"
+#include "xdptxss_dptx.h"
+#include "xdptxss_dualsplitter.h"
+#include "xdptxss_vtc.h"
 
 /************************** Constant Definitions *****************************/