diff --git a/src/enums.h b/src/enums.h
index 1a4a2487c..ba228481f 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -25,20 +25,20 @@
 
 LINPHONE_BEGIN_NAMESPACE
 
-enum MessageDirection {
-	IncomingMessage,
-	OutgoingMessage
+enum class MessageDirection {
+	Incoming,
+	Outgoing
 };
 
-enum MessageState {
-	IdleMessageState,
-	InProgressMessageState,
-	DeliveredMessageState,
-	NotDeliveredMessageState,
-	FileTransferErrorMessageState,
-	FileTransferDoneMessageState,
-	DeliveredToUserMessageState,
-	DisplayedMessageState
+enum class MessageState {
+	Idle,
+	InProgress,
+	Delivered,
+	NotDelivered,
+	FileTransferError,
+	FileTransferDone,
+	DeliveredToUser,
+	Displayed
 };
 
 LINPHONE_END_NAMESPACE