diff --git a/headers/os/locale/Country.h b/headers/os/locale/Country.h
index cdcfd05db0..7b86dcd41e 100644
--- a/headers/os/locale/Country.h
+++ b/headers/os/locale/Country.h
@@ -26,7 +26,7 @@ typedef enum {
 	B_HOUR,
 	B_MINUTE,
 	B_SECOND
-} BDateField;
+} BDateElement;
 
 
 class BCountry {
@@ -53,7 +53,7 @@ class BCountry {
 			bool longFormat);
 		status_t		FormatTime(BString* string, int*& fieldPositions,
 			int& fieldCount, time_t time, bool longFormat);
-		status_t		TimeFields(BDateField*& fields, int& fieldCount,
+		status_t		TimeFields(BDateElement*& fields, int& fieldCount,
 			bool longFormat);
 
 		bool		DateFormat(BString&, bool longFormat) const;
diff --git a/src/kits/locale/Country.cpp b/src/kits/locale/Country.cpp
index 937e5bdf9d..b22f1344ad 100644
--- a/src/kits/locale/Country.cpp
+++ b/src/kits/locale/Country.cpp
@@ -241,7 +241,7 @@ BCountry::FormatTime(BString* string, int*& fieldPositions, int& fieldCount,
 
 
 status_t
-BCountry::TimeFields(BDateField*& fields, int& fieldCount, bool longFormat)
+BCountry::TimeFields(BDateElement*& fields, int& fieldCount, bool longFormat)
 {
 	fields = NULL;
 	UErrorCode error = U_ZERO_ERROR;
@@ -264,7 +264,7 @@ BCountry::TimeFields(BDateField*& fields, int& fieldCount, bool longFormat)
 		fieldCount ++;
 	}
 
-	fields = (BDateField*) malloc(fieldCount * sizeof(BDateField));
+	fields = (BDateElement*) malloc(fieldCount * sizeof(BDateElement));
 
 	for (int i = 0 ; i < fieldCount ; i++ ) {
 		switch (fieldPosStorage[i]) {
diff --git a/src/preferences/time/DateTimeEdit.cpp b/src/preferences/time/DateTimeEdit.cpp
index 51ad7391b7..291833be4d 100644
--- a/src/preferences/time/DateTimeEdit.cpp
+++ b/src/preferences/time/DateTimeEdit.cpp
@@ -269,7 +269,7 @@ TTimeEdit::BuildDispatch(BMessage *message)
 
 	message->AddBool("time", true);
 
-	BDateField* dateFormat;
+	BDateElement* dateFormat;
 	int fieldCount;
 	BCountry* here;
 	be_locale_roster->GetDefaultCountry(&here);
@@ -297,7 +297,7 @@ void
 TTimeEdit::_CheckRange()
 {
 	int32 value = fHoldValue;
-	BDateField* fields;
+	BDateElement* fields;
 	int fieldCount;
 	BCountry* here;
 	be_locale_roster->GetDefaultCountry(&here);
@@ -363,7 +363,7 @@ bool
 TTimeEdit::_IsValidDoubleDigi(int32 value)
 {
 	bool isInRange = false;
-	BDateField* fields;
+	BDateElement* fields;
 	int fieldCount;
 	BCountry* here;
 	be_locale_roster->GetDefaultCountry(&here);
@@ -402,7 +402,7 @@ int32
 TTimeEdit::_SectionValue(int32 index) const
 {
 	int32 value;
-	BDateField* fields;
+	BDateElement* fields;
 	int fieldCount;
 	BCountry* here;
 	be_locale_roster->GetDefaultCountry(&here);