diff --git a/lib/sw_services/xilpm/examples/gic_setup.c b/lib/sw_services/xilpm/examples/gic_setup.c
index 5a88185e..577a5421 100644
--- a/lib/sw_services/xilpm/examples/gic_setup.c
+++ b/lib/sw_services/xilpm/examples/gic_setup.c
@@ -44,9 +44,9 @@ XScuGic GicInst;
  *
  * @return	Status of operation success (XST_* from xstatus.h)
  */
-int32_t GicInit(void)
+s32 GicInit(void)
 {
-	int32_t Status;
+	s32 Status;
 	XScuGic_Config *GicCfgPtr = XScuGic_LookupConfig(INTC_DEVICE_ID);
 
 	if (NULL == GicCfgPtr)
@@ -78,10 +78,10 @@ int32_t GicInit(void)
  *
  * @return:	status of operation success (XST_* from xstatus.h)
  */
-int32_t GicSetupInterruptSystem(uint32_t IntId,
+s32 GicSetupInterruptSystem(u32 IntId,
 		void *PeriphInstPtr, Xil_ExceptionHandler Handler)
 {
-	int32_t Status;
+	s32 Status;
 
 	Status = GicInit();
 	if(XST_SUCCESS != Status)
diff --git a/lib/sw_services/xilpm/examples/gic_setup.h b/lib/sw_services/xilpm/examples/gic_setup.h
index 569ae49b..125a196f 100644
--- a/lib/sw_services/xilpm/examples/gic_setup.h
+++ b/lib/sw_services/xilpm/examples/gic_setup.h
@@ -39,8 +39,8 @@
 
 extern XScuGic GicInst;
 
-int32_t GicSetupInterruptSystem(uint32_t IntId,
+s32 GicSetupInterruptSystem(u32 IntId,
 		void *PeriphInstPtr, Xil_ExceptionHandler Handler);
 
-int32_t GicInit();
+s32 GicInit();
 #endif
diff --git a/lib/sw_services/xilpm/examples/timer.c b/lib/sw_services/xilpm/examples/timer.c
index 96b092fe..e694c890 100644
--- a/lib/sw_services/xilpm/examples/timer.c
+++ b/lib/sw_services/xilpm/examples/timer.c
@@ -44,7 +44,7 @@
 #include "gic_setup.h"
 #include "pm_client.h"
 
-volatile uint32_t TickCount = 0;
+volatile u32 TickCount = 0;
 static XTtcPs timer0_inst;
 
 /**
@@ -53,7 +53,7 @@ static XTtcPs timer0_inst;
  */
 static void TickHandler(XTtcPs *timer_inst)
 {
-	uint32_t int_status = XTtcPs_GetInterruptStatus(timer_inst);
+	u32 int_status = XTtcPs_GetInterruptStatus(timer_inst);
 
 	int_status &= XTtcPs_ReadReg(timer_inst->Config.BaseAddress, XTTCPS_IER_OFFSET);
 	XTtcPs_ClearInterruptStatus(timer_inst, int_status);
@@ -66,7 +66,7 @@ static void TickHandler(XTtcPs *timer_inst)
  * @timer_inst	pointer to the timer instance
  * @sec		interval timeout in seconds
  */
-static void TimerSetIntervalMode(XTtcPs *TimerInstPtr, uint32_t PeriodInSec)
+static void TimerSetIntervalMode(XTtcPs *TimerInstPtr, u32 PeriodInSec)
 {
 	/* Stop the timer */
 	XTtcPs_Stop(TimerInstPtr);
@@ -83,9 +83,9 @@ static void TimerSetIntervalMode(XTtcPs *TimerInstPtr, uint32_t PeriodInSec)
  * TimerInit() - initializes timer0 device
  * @timeout	period for the interval timer interrupt generation
  */
-int32_t TimerInit(uint32_t PeriodInSec)
+s32 TimerInit(u32 PeriodInSec)
 {
-	int32_t status;
+	s32 status;
 	XTtcPs_Config *timer_config = XTtcPs_LookupConfig(TTC0_0_DEVICE_ID);
 
 	if (NULL == timer_config) {
@@ -113,9 +113,9 @@ int32_t TimerInit(uint32_t PeriodInSec)
  *
  * @return		Status of configuration success
  */
-int32_t TimerConfigure(uint32_t Period)
+s32 TimerConfigure(u32 Period)
 {
-	int32_t ret_status = TimerInit(Period);
+	s32 ret_status = TimerInit(Period);
 
 	switch (ret_status) {
 	case XST_SUCCESS:
diff --git a/lib/sw_services/xilpm/examples/timer.h b/lib/sw_services/xilpm/examples/timer.h
index 86a2c39b..e12066b2 100644
--- a/lib/sw_services/xilpm/examples/timer.h
+++ b/lib/sw_services/xilpm/examples/timer.h
@@ -46,10 +46,10 @@
 
 #define TIMER_PERIOD		3
 
-int32_t TimerInit(uint32_t timeout);
+s32 TimerInit(u32 timeout);
 
-int32_t TimerConfigure(uint32_t timer_period);
+s32 TimerConfigure(u32 timer_period);
 
-extern volatile uint32_t TickCount;
+extern volatile u32 TickCount;
 
 #endif /* _TIMER_H_ */
diff --git a/lib/sw_services/xilpm/examples/xilpm_selfsuspend_example.c b/lib/sw_services/xilpm/examples/xilpm_selfsuspend_example.c
index 13e799b1..3ba5aca9 100644
--- a/lib/sw_services/xilpm/examples/xilpm_selfsuspend_example.c
+++ b/lib/sw_services/xilpm/examples/xilpm_selfsuspend_example.c
@@ -72,18 +72,18 @@ extern void *_vector_table;
 #endif
 
 /* The below sections will be saved during suspend */
-extern uint8_t __data_start;
-extern uint8_t __bss_start__;
-extern uint8_t __data_end;
-extern uint8_t __bss_end__;
+extern u8 __data_start;
+extern u8 __bss_start__;
+extern u8 __data_end;
+extern u8 __bss_end__;
 
 /**
  * SaveContext() - called to save context of bss and data sections in OCM
  */
 static void SaveContext(void)
 {
-	uint8_t *MemPtr;
-	uint8_t *ContextMemPtr = (uint8_t *)CONTEXT_MEM_BASE;
+	u8 *MemPtr;
+	u8 *ContextMemPtr = (u8 *)CONTEXT_MEM_BASE;
 
 	for (MemPtr = &__data_start; MemPtr < &__data_end; MemPtr++, ContextMemPtr++) {
 		*ContextMemPtr = *MemPtr;
@@ -101,8 +101,8 @@ static void SaveContext(void)
  */
 static void RestoreContext(void)
 {
-	uint8_t *MemPtr;
-	uint8_t *ContextMemPtr = (uint8_t *)CONTEXT_MEM_BASE;
+	u8 *MemPtr;
+	u8 *ContextMemPtr = (u8 *)CONTEXT_MEM_BASE;
 
 	for (MemPtr = &__data_start; MemPtr < &__data_end; MemPtr++, ContextMemPtr++) {
 		*MemPtr = *ContextMemPtr;
@@ -115,7 +115,7 @@ static void RestoreContext(void)
 	pm_dbg("Restored context (tick_count = %d)\n", TickCount);
 }
 
-static uint32_t GetCpuId(void)
+static u32 GetCpuId(void)
 {
 #ifdef __aarch64__
 	u64 id;
@@ -205,7 +205,7 @@ static void PrepareSuspend(void)
 /**
  * InitApp() - initialize interrupts and context
  */
-static uint32_t InitApp(void)
+static u32 InitApp(void)
 {
 	enum XPmBootStatus status = XPm_GetBootStatus();
 
@@ -232,7 +232,7 @@ static uint32_t InitApp(void)
 int main(void)
 {
 	Xil_DCacheDisable();
-	uint32_t Status = InitApp();
+	u32 Status = InitApp();
 
 	if (XST_SUCCESS != Status) {
 		return XST_FAILURE;
diff --git a/lib/sw_services/xilpm/src/apu/pm_client.c b/lib/sw_services/xilpm/src/apu/pm_client.c
index e401b4c1..ddf22ff1 100644
--- a/lib/sw_services/xilpm/src/apu/pm_client.c
+++ b/lib/sw_services/xilpm/src/apu/pm_client.c
@@ -83,7 +83,7 @@ static const struct XPm_Master *const pm_masters_all[] = {
  *
  * Return: pointer to a master structure if master is found, otherwise NULL
  */
-const struct XPm_Master *pm_get_master(const uint32_t cpuid)
+const struct XPm_Master *pm_get_master(const u32 cpuid)
 {
 	if (cpuid >=0 && PM_ARRAY_SIZE(pm_masters_all)) {
 		return pm_masters_all[cpuid];
@@ -100,7 +100,7 @@ const struct XPm_Master *pm_get_master(const uint32_t cpuid)
  */
 const struct XPm_Master *pm_get_master_by_node(const enum XPmNodeId nid)
 {
-	uint8_t i;
+	u8 i;
 
 	for (i = 0; i < PM_ARRAY_SIZE(pm_masters_all); i++) {
 		if (nid == pm_masters_all[i]->node_id) {
@@ -111,9 +111,9 @@ const struct XPm_Master *pm_get_master_by_node(const enum XPmNodeId nid)
 	return NULL;
 }
 
-static uint32_t pm_get_cpuid(const enum XPmNodeId node)
+static u32 pm_get_cpuid(const enum XPmNodeId node)
 {
-	uint32_t i;
+	u32 i;
 
 	for (i = 0; i < PM_ARRAY_SIZE(pm_masters_all); i++) {
 		if (pm_masters_all[i]->node_id == node) {
@@ -145,10 +145,10 @@ void XPm_ClientAbortSuspend(void)
 
 void XPm_ClientWakeup(const struct XPm_Master *const master)
 {
-	uint32_t cpuid = pm_get_cpuid(master->node_id);
+	u32 cpuid = pm_get_cpuid(master->node_id);
 
 	if (UNDEFINED_CPUID != cpuid) {
-		uint32_t val = pm_read(MASTER_PWRCTL);
+		u32 val = pm_read(MASTER_PWRCTL);
 		val &= ~(master->pwrdn_mask);
 		pm_write(MASTER_PWRCTL, val);
 	}
diff --git a/lib/sw_services/xilpm/src/common/pm_api_sys.c b/lib/sw_services/xilpm/src/common/pm_api_sys.c
index 0fd2317c..e2b207bf 100644
--- a/lib/sw_services/xilpm/src/common/pm_api_sys.c
+++ b/lib/sw_services/xilpm/src/common/pm_api_sys.c
@@ -41,11 +41,11 @@
  * final version.
  */
 #define PACK_PAYLOAD(pl, arg0, arg1, arg2, arg3, arg4)			\
-	pl[0] = (uint32_t)arg0;						\
-	pl[1] = (uint32_t)arg1;						\
-	pl[2] = (uint32_t)arg2;						\
-	pl[3] = (uint32_t)arg3;						\
-	pl[4] = (uint32_t)arg4;						\
+	pl[0] = (u32)arg0;						\
+	pl[1] = (u32)arg1;						\
+	pl[2] = (u32)arg2;						\
+	pl[3] = (u32)arg3;						\
+	pl[4] = (u32)arg4;						\
 	pm_dbg("%s(%d, %d, %d, %d)\n", __func__, arg1, arg2, arg3, arg4);
 
 /**
@@ -59,7 +59,7 @@
  */
 enum XPmBootStatus XPm_GetBootStatus()
 {
-	uint32_t pwrdn_req = pm_read(MASTER_PWRCTL);
+	u32 pwrdn_req = pm_read(MASTER_PWRCTL);
 	if (0 != (pwrdn_req & primary_master->pwrdn_mask)) {
 		pm_write(MASTER_PWRCTL, pwrdn_req & (~primary_master->pwrdn_mask));
 		return PM_RESUME;
@@ -74,7 +74,7 @@ enum XPmBootStatus XPm_GetBootStatus()
  */
 static enum XPmStatus pm_ipi_wait(const struct XPm_Master *const master)
 {
-	volatile uint32_t status = 1;
+	volatile u32 status = 1;
 
 	/* Wait until previous interrupt is handled by PMU */
 	while (status) {
@@ -94,11 +94,11 @@ static enum XPmStatus pm_ipi_wait(const struct XPm_Master *const master)
  * @return	Returns status, either success or error+reason
  */
 static enum XPmStatus pm_ipi_send(const struct XPm_Master *const master,
-				      uint32_t payload[PAYLOAD_ARG_CNT])
+				      u32 payload[PAYLOAD_ARG_CNT])
 {
-	uint32_t i;
-	uint32_t offset = 0;
-	uint32_t buffer_base = master->ipi->buffer_base
+	u32 i;
+	u32 offset = 0;
+	u32 buffer_base = master->ipi->buffer_base
 		+ IPI_BUFFER_TARGET_PMU_OFFSET
 		+ IPI_BUFFER_REQ_OFFSET;
 
@@ -122,12 +122,12 @@ static enum XPmStatus pm_ipi_send(const struct XPm_Master *const master,
  * @return	Returns status, either success or error+reason
  */
 static enum XPmStatus pm_ipi_buff_read32(const struct XPm_Master *const master,
-					     uint32_t *value)
+					     u32 *value)
 {
-	uint32_t buffer_base = master->ipi->buffer_base
+	u32 buffer_base = master->ipi->buffer_base
 		+ IPI_BUFFER_TARGET_PMU_OFFSET
 		+ IPI_BUFFER_RESP_OFFSET;
-	volatile uint32_t status = 1;
+	volatile u32 status = 1;
 
 	/* Wait until current IPI interrupt is handled by PMU */
 	while (status) {
@@ -160,11 +160,11 @@ static enum XPmStatus pm_ipi_buff_read32(const struct XPm_Master *const master,
  * @return	Returns status, either success or error+reason
  */
 enum XPmStatus XPm_SelfSuspend(const enum XPmNodeId nid,
-				   const uint32_t latency,
-				   const uint8_t state)
+				   const u32 latency,
+				   const u8 state)
 {
 	enum XPmStatus ret;
-	uint32_t payload[PAYLOAD_ARG_CNT];
+	u32 payload[PAYLOAD_ARG_CNT];
 
 	const struct XPm_Master *master = pm_get_master_by_node(nid);
 	if (NULL == master) {
@@ -205,10 +205,10 @@ enum XPmStatus XPm_SelfSuspend(const enum XPmNodeId nid,
  */
 enum XPmStatus XPm_ReqSuspend(const enum XPmNodeId target,
 				  const enum XPmRequestAck ack,
-				  const uint32_t latency, const uint8_t state)
+				  const u32 latency, const u8 state)
 {
 	enum XPmStatus ret;
-	uint32_t payload[PAYLOAD_ARG_CNT];
+	u32 payload[PAYLOAD_ARG_CNT];
 
 	/* Send request to the PMU */
 	PACK_PAYLOAD(payload, PM_REQ_SUSPEND, target, ack, latency, state);
@@ -231,7 +231,7 @@ enum XPmStatus XPm_ReqWakeUp(const enum XPmNodeId target,
 				 const enum XPmRequestAck ack)
 {
 	enum XPmStatus ret;
-	uint32_t payload[PAYLOAD_ARG_CNT];
+	u32 payload[PAYLOAD_ARG_CNT];
 	const struct XPm_Master *master = pm_get_master_by_node(target);
 
 	XPm_ClientWakeup(master);
@@ -257,7 +257,7 @@ enum XPmStatus XPm_ForcePowerDown(const enum XPmNodeId target,
 				      const enum XPmRequestAck ack)
 {
 	enum XPmStatus ret;
-	uint32_t payload[PAYLOAD_ARG_CNT];
+	u32 payload[PAYLOAD_ARG_CNT];
 
 	/* Send request to the PMU */
 	PACK_PAYLOAD(payload, PM_FORCE_POWERDOWN, target, ack, 0, 0);
@@ -282,7 +282,7 @@ enum XPmStatus XPm_ForcePowerDown(const enum XPmNodeId target,
 enum XPmStatus XPm_AbortSuspend(const enum XPmAbortReason reason)
 {
 	enum XPmStatus status;
-	uint32_t payload[PAYLOAD_ARG_CNT];
+	u32 payload[PAYLOAD_ARG_CNT];
 
 	/*
 	 * Do client specific abort suspend operations
@@ -308,9 +308,9 @@ enum XPmStatus XPm_AbortSuspend(const enum XPmAbortReason reason)
  */
 enum XPmStatus XPm_SetWakeUpSource(const enum XPmNodeId target,
 					const enum XPmNodeId wkup_node,
-					const uint8_t enable)
+					const u8 enable)
 {
-	uint32_t payload[PAYLOAD_ARG_CNT];
+	u32 payload[PAYLOAD_ARG_CNT];
 	PACK_PAYLOAD(payload, PM_SET_WAKEUP_SOURCE, target, wkup_node, enable, 0);
 	return pm_ipi_send(primary_master, payload);
 }
@@ -321,9 +321,9 @@ enum XPmStatus XPm_SetWakeUpSource(const enum XPmNodeId target,
  *
  * @return	Returns status, either success or error+reason
  */
-enum XPmStatus XPm_SystemShutdown(const uint8_t restart)
+enum XPmStatus XPm_SystemShutdown(const u8 restart)
 {
-	uint32_t payload[PAYLOAD_ARG_CNT];
+	u32 payload[PAYLOAD_ARG_CNT];
 	PACK_PAYLOAD(payload, PM_SYSTEM_SHUTDOWN, restart, 0, 0, 0);
 	return pm_ipi_send(primary_master, payload);
 }
@@ -340,12 +340,12 @@ enum XPmStatus XPm_SystemShutdown(const uint8_t restart)
  * @return	Returns status, either success or error+reason
  */
 enum XPmStatus XPm_ReqNode(const enum XPmNodeId node,
-			       const uint32_t capabilities,
-			       const uint32_t qos,
+			       const u32 capabilities,
+			       const u32 qos,
 			       const enum XPmRequestAck ack)
 {
 	enum XPmStatus ret;
-	uint32_t payload[PAYLOAD_ARG_CNT];
+	u32 payload[PAYLOAD_ARG_CNT];
 
 	PACK_PAYLOAD(payload, PM_REQ_NODE, node, capabilities, qos, ack);
 	ret = pm_ipi_send(primary_master, payload);
@@ -368,12 +368,12 @@ enum XPmStatus XPm_ReqNode(const enum XPmNodeId node,
  * @return	Returns status, either success or error+reason
  */
 enum XPmStatus XPm_SetRequirement(const enum XPmNodeId nid,
-				      const uint32_t capabilities,
-				      const uint32_t qos,
+				      const u32 capabilities,
+				      const u32 qos,
 				      const enum XPmRequestAck ack)
 {
 	enum XPmStatus ret;
-	uint32_t payload[PAYLOAD_ARG_CNT];
+	u32 payload[PAYLOAD_ARG_CNT];
 	PACK_PAYLOAD(payload, PM_SET_REQUIREMENT, nid, capabilities, qos, ack);
 	ret = pm_ipi_send(primary_master, payload);
 
@@ -391,9 +391,9 @@ enum XPmStatus XPm_SetRequirement(const enum XPmNodeId nid,
  * @return	Returns status, either success or error+reason
  */
 enum XPmStatus XPm_ReleaseNode(const enum XPmNodeId node,
-				   const uint32_t latency)
+				   const u32 latency)
 {
-	uint32_t payload[PAYLOAD_ARG_CNT];
+	u32 payload[PAYLOAD_ARG_CNT];
 	PACK_PAYLOAD(payload, PM_RELEASE_NODE, node, latency, 0, 0);
 	return pm_ipi_send(primary_master, payload);
 }
@@ -406,9 +406,9 @@ enum XPmStatus XPm_ReleaseNode(const enum XPmNodeId node,
  * @return	Returns status, either success or error+reason
  */
 enum XPmStatus XPm_SetMaxLatency(const enum XPmNodeId node,
-				      const uint32_t latency)
+				      const u32 latency)
 {
-	uint32_t payload[PAYLOAD_ARG_CNT];
+	u32 payload[PAYLOAD_ARG_CNT];
 
 	/* Send request to the PMU */
 	PACK_PAYLOAD(payload, PM_SET_MAX_LATENCY, node, latency, 0, 0);
@@ -423,10 +423,10 @@ enum XPmStatus XPm_SetMaxLatency(const enum XPmNodeId node,
  *
  * @return	Returns status, either success or error+reason
  */
-enum XPmStatus XPm_GetApiVersion(uint32_t *version)
+enum XPmStatus XPm_GetApiVersion(u32 *version)
 {
 	enum XPmStatus ret;
-	uint32_t payload[PAYLOAD_ARG_CNT];
+	u32 payload[PAYLOAD_ARG_CNT];
 
 	/* Send request to the PMU */
 	PACK_PAYLOAD(payload, PM_GET_API_VERSION, 0, 0, 0, 0);
@@ -449,7 +449,7 @@ enum XPmStatus XPm_GetApiVersion(uint32_t *version)
 enum XPmStatus XPm_GetNodeStatus(const enum XPmNodeId node)
 {
 	/* TODO: Add power state argument!! */
-	uint32_t payload[PAYLOAD_ARG_CNT];
+	u32 payload[PAYLOAD_ARG_CNT];
 	PACK_PAYLOAD(payload, PM_GET_NODE_STATUS, node, 0, 0, 0);
 	return pm_ipi_send(primary_master, payload);
 }
diff --git a/lib/sw_services/xilpm/src/common/pm_api_sys.h b/lib/sw_services/xilpm/src/common/pm_api_sys.h
index d084e33d..489eaf0d 100644
--- a/lib/sw_services/xilpm/src/common/pm_api_sys.h
+++ b/lib/sw_services/xilpm/src/common/pm_api_sys.h
@@ -33,7 +33,6 @@
 #ifndef _PM_API_SYS_H_
 #define _PM_API_SYS_H_
 
-#include <stdint.h>
 #include "pm_defs.h"
 
 enum XPmBootStatus XPm_GetBootStatus();
@@ -41,12 +40,12 @@ enum XPmBootStatus XPm_GetBootStatus();
 /* System-level API function declarations */
 enum XPmStatus XPm_ReqSuspend(const enum XPmNodeId node,
 				  const enum XPmRequestAck ack,
-				  const uint32_t latency,
-				  const uint8_t state);
+				  const u32 latency,
+				  const u8 state);
 
 enum XPmStatus XPm_SelfSuspend(const enum XPmNodeId node,
-				   const uint32_t latency,
-				   const uint8_t state);
+				   const u32 latency,
+				   const u8 state);
 
 enum XPmStatus XPm_ForcePowerDown(const enum XPmNodeId node,
 				      const enum XPmRequestAck ack);
@@ -58,26 +57,26 @@ enum XPmStatus XPm_ReqWakeUp(const enum XPmNodeId node,
 
 enum XPmStatus XPm_SetWakeUpSource(const enum XPmNodeId target,
 					const enum XPmNodeId wkup_node,
-					const uint8_t enable);
+					const u8 enable);
 
-enum XPmStatus XPm_SystemShutdown(const uint8_t restart);
+enum XPmStatus XPm_SystemShutdown(const u8 restart);
 
 /* API functions for managing PM Slaves */
 enum XPmStatus XPm_ReqNode(const enum XPmNodeId node,
-			       const uint32_t capabilities,
-			       const uint32_t qos,
+			       const u32 capabilities,
+			       const u32 qos,
 			       const enum XPmRequestAck ack);
 enum XPmStatus XPm_ReleaseNode(const enum XPmNodeId node,
-				   const uint32_t latency);
+				   const u32 latency);
 enum XPmStatus XPm_SetRequirement(const enum XPmNodeId node,
-				      const uint32_t capabilities,
-				      const uint32_t qos,
+				      const u32 capabilities,
+				      const u32 qos,
 				      const enum XPmRequestAck ack);
 enum XPmStatus XPm_SetMaxLatency(const enum XPmNodeId node,
-				      const uint32_t latency);
+				      const u32 latency);
 
 /* Miscellaneous API functions */
-enum XPmStatus XPm_GetApiVersion(uint32_t *version);
+enum XPmStatus XPm_GetApiVersion(u32 *version);
 
 enum XPmStatus XPm_GetNodeStatus(const enum XPmNodeId node);
 
diff --git a/lib/sw_services/xilpm/src/common/pm_common.h b/lib/sw_services/xilpm/src/common/pm_common.h
index a0ac6c57..28bfd620 100644
--- a/lib/sw_services/xilpm/src/common/pm_common.h
+++ b/lib/sw_services/xilpm/src/common/pm_common.h
@@ -59,19 +59,19 @@
 #endif
 
 struct XPm_Ipi {
-	const uint32_t mask;
-	const uint32_t base;
-	const uint32_t buffer_base;
+	const u32 mask;
+	const u32 base;
+	const u32 buffer_base;
 };
 
 struct XPm_Master {
 	const enum XPmNodeId node_id;
-	const uint32_t pwrdn_mask;
+	const u32 pwrdn_mask;
 	const struct XPm_Ipi *const ipi;
 };
 
 const enum XPmNodeId pm_get_subsystem_node(void);
-const struct XPm_Master *pm_get_master(const uint32_t cpuid);
+const struct XPm_Master *pm_get_master(const u32 cpuid);
 const struct XPm_Master *pm_get_master_by_node(const enum XPmNodeId nid);
 
 #define APU_0_PWRCTL_CPUPWRDWNREQ_MASK	0x00000001U
@@ -98,7 +98,7 @@ const struct XPm_Master *pm_get_master_by_node(const enum XPmNodeId nid);
 #endif
 
 #ifndef bool
-	#define bool	uint8_t
+	#define bool	u8
 	#define true	1U
 	#define false	0U
 #endif
diff --git a/lib/sw_services/xilpm/src/rpu/pm_client.c b/lib/sw_services/xilpm/src/rpu/pm_client.c
index 29a6b5b5..394ab8bb 100644
--- a/lib/sw_services/xilpm/src/rpu/pm_client.c
+++ b/lib/sw_services/xilpm/src/rpu/pm_client.c
@@ -73,7 +73,7 @@ static const struct XPm_Master *const pm_masters_all[] = {
  *
  * Return: pointer to a master structure if master is found, otherwise NULL
  */
-const struct XPm_Master *pm_get_master(const uint32_t cpuid)
+const struct XPm_Master *pm_get_master(const u32 cpuid)
 {
 	if (cpuid >=0 && PM_ARRAY_SIZE(pm_masters_all)) {
 		return pm_masters_all[cpuid];
@@ -89,7 +89,7 @@ const struct XPm_Master *pm_get_master(const uint32_t cpuid)
  */
 const struct XPm_Master *pm_get_master_by_node(const enum XPmNodeId nid)
 {
-	uint8_t i;
+	u8 i;
 
 	for (i = 0; i < PM_ARRAY_SIZE(pm_masters_all); i++) {
 		if (nid == pm_masters_all[i]->node_id) {
@@ -100,9 +100,9 @@ const struct XPm_Master *pm_get_master_by_node(const enum XPmNodeId nid)
 	return NULL;
 }
 
-static uint32_t pm_get_cpuid(const enum XPmNodeId node)
+static u32 pm_get_cpuid(const enum XPmNodeId node)
 {
-	uint32_t i;
+	u32 i;
 
 	for (i = 0; i < PM_ARRAY_SIZE(pm_masters_all); i++) {
 		if (pm_masters_all[i]->node_id == node) {
@@ -134,10 +134,10 @@ void XPm_ClientAbortSuspend(void)
 
 void XPm_ClientWakeup(const struct XPm_Master *const master)
 {
-	uint32_t cpuid = pm_get_cpuid(master->node_id);
+	u32 cpuid = pm_get_cpuid(master->node_id);
 
 	if (UNDEFINED_CPUID != cpuid) {
-		uint32_t val = pm_read(MASTER_PWRCTL);
+		u32 val = pm_read(MASTER_PWRCTL);
 		val &= ~(master->pwrdn_mask);
 		pm_write(MASTER_PWRCTL, val);
 	}