Index: uspace/drv/time/cmos-rtc/cmos-regs.h
===================================================================
--- uspace/drv/time/cmos-rtc/cmos-regs.h	(revision a44b58c2387a00f79c1a55e10ea4089a8e631503)
+++ uspace/drv/time/cmos-rtc/cmos-regs.h	(revision 6a3808eaae144c8696d284cf2ae0335d51f453ea)
@@ -38,14 +38,14 @@
 
 #define RTC_STATUS_B      0x0B
-#define RTC_MASK_24H      0x02 /* 24h mode */
-#define RTC_MASK_BCD      0x04 /* BCD mode */
-#define RTC_MASK_INH      0x80 /* Inhibit updates */
+#define RTC_B_24H         0x02 /* 24h mode */
+#define RTC_B_BCD         0x04 /* BCD mode */
+#define RTC_B_INH         0x80 /* Inhibit updates */
 
 #define RTC_STATUS_D      0x0D
-#define RTC_BATTERY_OK    0x80 /* Battery status */
+#define RTC_D_BATTERY_OK  0x80 /* Battery status */
 
 #define RTC_STATUS_A      0x0A
-#define RTC_MASK_UPDATE   0x80 /* Update in progress */
-#define RTC_MASK_CLK_STOP 0x70 /* Stop the clock */
+#define RTC_A_UPDATE      0x80 /* Update in progress */
+#define RTC_A_CLK_STOP    0x70 /* Stop the clock */
 
 #endif
Index: uspace/drv/time/cmos-rtc/cmos-rtc.c
===================================================================
--- uspace/drv/time/cmos-rtc/cmos-rtc.c	(revision a44b58c2387a00f79c1a55e10ea4089a8e631503)
+++ uspace/drv/time/cmos-rtc/cmos-rtc.c	(revision 6a3808eaae144c8696d284cf2ae0335d51f453ea)
@@ -272,5 +272,5 @@
 rtc_update_in_progress(rtc_t *rtc)
 {
-	return rtc_register_read(rtc, RTC_STATUS_A) & RTC_MASK_UPDATE;
+	return rtc_register_read(rtc, RTC_STATUS_A) & RTC_A_UPDATE;
 }
 
@@ -313,5 +313,5 @@
 	/* Check if the RTC is working in 12h mode */
 	bool _12h_mode = !(rtc_register_read(rtc, RTC_STATUS_B) &
-	    RTC_MASK_24H);
+	    RTC_B_24H);
 
 	if (_12h_mode) {
@@ -325,5 +325,5 @@
 
 	/* Check if the RTC is working in BCD mode */
-	bcd_mode = !(rtc_register_read(rtc, RTC_STATUS_B) & RTC_MASK_BCD);
+	bcd_mode = !(rtc_register_read(rtc, RTC_STATUS_B) & RTC_B_BCD);
 
 	if (bcd_mode) {
@@ -396,7 +396,7 @@
 	reg_b = rtc_register_read(rtc, RTC_STATUS_B);
 
-	if (!(reg_b & RTC_MASK_24H)) {
+	if (!(reg_b & RTC_B_24H)) {
 		/* Force 24h mode of operation */
-		reg_b |= RTC_MASK_24H;
+		reg_b |= RTC_B_24H;
 		rtc_register_write(rtc, RTC_STATUS_B, reg_b);
 	}
@@ -410,5 +410,5 @@
 
 	/* Check if the rtc is working in bcd mode */
-	bcd_mode = !(reg_b & RTC_MASK_BCD);
+	bcd_mode = !(reg_b & RTC_B_BCD);
 	if (bcd_mode) {
 		/* Convert the tm struct fields in BCD mode */
@@ -422,5 +422,5 @@
 
 	/* Inhibit updates */
-	rtc_register_write(rtc, RTC_STATUS_B, reg_b | RTC_MASK_INH);
+	rtc_register_write(rtc, RTC_STATUS_B, reg_b | RTC_B_INH);
 
 	/* Write current time to RTC */
@@ -434,5 +434,5 @@
 	/* Stop the clock */
 	reg_a = rtc_register_read(rtc, RTC_STATUS_A);
-	rtc_register_write(rtc, RTC_STATUS_A, RTC_MASK_CLK_STOP | reg_a);
+	rtc_register_write(rtc, RTC_STATUS_A, RTC_A_CLK_STOP | reg_a);
 	
 	/* Enable updates */
@@ -618,5 +618,5 @@
 	case CLOCK_GET_BATTERY_STATUS:
 		batt_ok = rtc_register_read(rtc, RTC_STATUS_D) &
-		    RTC_BATTERY_OK;
+		    RTC_D_BATTERY_OK;
 		async_answer_1(callid, EOK, batt_ok);
 		break;