diff --git a/headers/private/graphics/common/video_electronics.h b/headers/private/graphics/common/video_configuration.h
similarity index 84%
rename from headers/private/graphics/common/video_electronics.h
rename to headers/private/graphics/common/video_configuration.h
index c479f39b07..57bf96e5eb 100644
--- a/headers/private/graphics/common/video_electronics.h
+++ b/headers/private/graphics/common/video_configuration.h
@@ -5,8 +5,8 @@
  * Authors:
  *      Alexander von Gluck, kallisti5@unixzen.com
  */
-#ifndef _VIDEO_ELECTRONICS_H
-#define _VIDEO_ELECTRONICS_H
+#ifndef _VIDEO_CONFIGURATION_H
+#define _VIDEO_CONFIGURATION_H
 
 
 // Video connector types
@@ -42,8 +42,8 @@ extern "C" {
 
 
 // mostly for debugging detected monitors
-const char* decode_connector_name(uint32 connector);
-const char* decode_encoder_name(uint32 encoder);
+const char* get_connector_name(uint32 connector);
+const char* get_encoder_name(uint32 encoder);
 
 
 #ifdef __cplusplus
@@ -51,4 +51,4 @@ const char* decode_encoder_name(uint32 encoder);
 #endif
 
 
-#endif /* _VIDEO_ELECTRONICS_H */
+#endif /* _VIDEO_CONFIGURATION_H */
diff --git a/src/add-ons/accelerants/common/Jamfile b/src/add-ons/accelerants/common/Jamfile
index 7c9de8cf95..a1ab758013 100644
--- a/src/add-ons/accelerants/common/Jamfile
+++ b/src/add-ons/accelerants/common/Jamfile
@@ -9,7 +9,7 @@ UsePrivateHeaders [ FDirName graphics common ] ;
 StaticLibrary libaccelerantscommon.a :
 	compute_display_timing.cpp
 	create_display_modes.cpp
-	video_electronics.c
+	video_configuration.cpp
 	ddc.c
 	decode_edid.c
 	dump_edid.c
diff --git a/src/add-ons/accelerants/common/video_electronics.c b/src/add-ons/accelerants/common/video_configuration.cpp
similarity index 89%
rename from src/add-ons/accelerants/common/video_electronics.c
rename to src/add-ons/accelerants/common/video_configuration.cpp
index 03fc884123..a6ed5bd1b9 100644
--- a/src/add-ons/accelerants/common/video_electronics.c
+++ b/src/add-ons/accelerants/common/video_configuration.cpp
@@ -10,11 +10,11 @@
 #include <KernelExport.h>
 #include <stdio.h>
 
-#include "video_electronics.h"
+#include "video_configuration.h"
 
 
 const char*
-decode_connector_name(uint32 connector)
+get_connector_name(uint32 connector)
 {
 	switch (connector) {
 		case VIDEO_CONNECTOR_VGA:
@@ -48,12 +48,12 @@ decode_connector_name(uint32 connector)
 		case VIDEO_CONNECTOR_UNKNOWN:
 			return "Unknown";
 	}
-	return "Connector Undefined";
+	return "Undefined";
 }
 
 
 const char*
-decode_encoder_name(uint32 encoder)
+get_encoder_name(uint32 encoder)
 {
 	switch (encoder) {
 		case VIDEO_ENCODER_NONE:
@@ -67,5 +67,5 @@ decode_encoder_name(uint32 encoder)
 		case VIDEO_ENCODER_TVDAC:
 			return "TV DAC";
 	}
-	return "Encoder Undefined";
+	return "Undefined";
 }
diff --git a/src/add-ons/accelerants/radeon_hd/display.cpp b/src/add-ons/accelerants/radeon_hd/display.cpp
index 38ccb95558..ed2c114384 100644
--- a/src/add-ons/accelerants/radeon_hd/display.cpp
+++ b/src/add-ons/accelerants/radeon_hd/display.cpp
@@ -312,7 +312,7 @@ detect_connectors_legacy()
 	for (i = 0; i < ATOM_MAX_SUPPORTED_DEVICE_INFO; i++) {
 		if (gConnector[i]->valid == true) {
 			TRACE("%s: connector #%" B_PRId32 " is %s\n", __func__, i,
-				decode_connector_name(gConnector[i]->connector_type));
+				get_connector_name(gConnector[i]->connector_type));
 		}
 	}
 
@@ -584,10 +584,10 @@ detect_connectors()
 			// TODO : aux chan transactions
 
 			TRACE("%s: Path #%" B_PRId32 ": Found %s (0x%" B_PRIX32 ")\n",
-				__func__, i, decode_connector_name(connector_type),
+				__func__, i, get_connector_name(connector_type),
 				connector_type);
 			TRACE("%s: Path #%" B_PRId32 ": Found encoder %s\n", __func__,
-				i, decode_encoder_name(encoder_type));
+				i, get_encoder_name(encoder_type));
 
 			gConnector[connector_index]->valid = true;
 
@@ -669,8 +669,8 @@ debug_displays()
 		if (gDisplay[id]->active) {
 			uint32 connector_type = gConnector[connector_index]->connector_type;
 			uint32 encoder_type = gConnector[connector_index]->encoder_type;
-			TRACE(" + connector: %s\n", decode_connector_name(connector_type));
-			TRACE(" + encoder:   %s\n", decode_encoder_name(encoder_type));
+			TRACE(" + connector: %s\n", get_connector_name(connector_type));
+			TRACE(" + encoder:   %s\n", get_encoder_name(encoder_type));
 
 			TRACE(" + limits: Vert Min/Max: %" B_PRIu32 "/%" B_PRIu32"\n",
 				gDisplay[id]->vfreq_min, gDisplay[id]->vfreq_max);
diff --git a/src/add-ons/accelerants/radeon_hd/display.h b/src/add-ons/accelerants/radeon_hd/display.h
index 517a28d6f6..064419359a 100644
--- a/src/add-ons/accelerants/radeon_hd/display.h
+++ b/src/add-ons/accelerants/radeon_hd/display.h
@@ -9,7 +9,7 @@
 #define RADEON_HD_DISPLAY_H
 
 
-#include <video_electronics.h>
+#include <video_configuration.h>
 
 
 // convert radeon connector to common connector type