diff --git a/lib/raop.c b/lib/raop.c
index 792e3dd..4076838 100755
--- a/lib/raop.c
+++ b/lib/raop.c
@@ -51,12 +51,12 @@ struct raop_s {
     unsigned short data_lport;
     unsigned short mirror_data_lport;  
 
-    /* plist display items: width, height, refreshRate, maxFPS, overscanned */
-    uint16_t display_width;
-    uint16_t display_height;
-    uint8_t display_refresh_rate;
-    uint8_t display_max_fps;
-    uint8_t display_overscanned;
+    /* configurable plist items: width, height, refreshRate, maxFPS, overscanned */
+    uint16_t width;
+    uint16_t height;
+    uint8_t refreshRate;
+    uint8_t maxFPS;
+    uint8_t overscanned;
 };
 
 struct raop_conn_s {
@@ -363,12 +363,12 @@ raop_init(int max_clients, raop_callbacks_t *callbacks) {
     raop->data_lport = 0;
     raop->mirror_data_lport = 0;
 
-    /* initialize display plist parameters */
-    raop->display_width = 1920;
-    raop->display_height = 1080;
-    raop->display_refresh_rate = 60;
-    raop->display_max_fps = 30;
-    raop->display_overscanned = 0;
+    /* initialize configurable plist parameters */
+    raop->width = 1920;
+    raop->height = 1080;
+    raop->refreshRate = 60;
+    raop->maxFPS = 30;
+    raop->overscanned = 0;
     
     return raop;
 }
@@ -402,14 +402,14 @@ raop_set_log_level(raop_t *raop, int level) {
 }
 
 void raop_set_display(raop_t *raop, unsigned short width, unsigned short height,
-                      unsigned short refresh_rate, unsigned short max_fps, unsigned short overscanned){
+                      unsigned short refreshRate, unsigned short maxFPS, unsigned short overscanned){
     assert(raop);
 
-    if (width) raop->display_width = (uint16_t) width;
-    if (height) raop->display_height = (uint16_t) height;
-    if (refresh_rate && refresh_rate < 256) raop->display_refresh_rate = (uint8_t) refresh_rate;
-    if (max_fps && max_fps < 256) raop->display_max_fps = (uint8_t) max_fps;
-    if (overscanned) raop->display_overscanned = 1;
+    if (width) raop->width = (uint16_t) width;
+    if (height) raop->height = (uint16_t) height;
+    if (refreshRate && refreshRate < 256) raop->refreshRate = (uint8_t) refreshRate;
+    if (maxFPS && maxFPS < 256) raop->maxFPS = (uint8_t) maxFPS;
+    if (overscanned) raop->overscanned = 1;
 }
 
 void
diff --git a/lib/raop.h b/lib/raop.h
index 37a8d6a..3fc7063 100755
--- a/lib/raop.h
+++ b/lib/raop.h
@@ -58,7 +58,7 @@ RAOP_API raop_t *raop_init(int max_clients, raop_callbacks_t *callbacks);
 RAOP_API void raop_set_log_level(raop_t *raop, int level);
 RAOP_API void raop_set_log_callback(raop_t *raop, raop_log_callback_t callback, void *cls);
 RAOP_API void raop_set_display(raop_t *raop, unsigned short width, unsigned short height,
-                               unsigned short refresh_rate, unsigned short max_fps, unsigned short overscanned);
+                               unsigned short refreshRate, unsigned short maxFPS, unsigned short overscanned);
 RAOP_API void raop_set_port(raop_t *raop, unsigned short port);
 RAOP_API void raop_set_udp_ports(raop_t *raop, unsigned short port[3]);
 RAOP_API void raop_set_tcp_ports(raop_t *raop, unsigned short port[2]);
diff --git a/lib/raop_handlers.h b/lib/raop_handlers.h
index c81bf05..7cb274f 100755
--- a/lib/raop_handlers.h
+++ b/lib/raop_handlers.h
@@ -135,14 +135,14 @@ raop_handler_info(raop_conn_t *conn,
     plist_t displays_0_uuid_node = plist_new_string("e0ff8a27-6738-3d56-8a16-cc53aacee925");
     plist_t displays_0_width_physical_node = plist_new_bool(0);
     plist_t displays_0_height_physical_node = plist_new_bool(0);
-    plist_t displays_0_width_node = plist_new_uint(conn->raop->display_width);
-    plist_t displays_0_height_node = plist_new_uint(conn->raop->display_height);
-    plist_t displays_0_width_pixels_node = plist_new_uint(conn->raop->display_width);
-    plist_t displays_0_height_pixels_node = plist_new_uint(conn->raop->display_height);
+    plist_t displays_0_width_node = plist_new_uint(conn->raop->width);
+    plist_t displays_0_height_node = plist_new_uint(conn->raop->height);
+    plist_t displays_0_width_pixels_node = plist_new_uint(conn->raop->width);
+    plist_t displays_0_height_pixels_node = plist_new_uint(conn->raop->height);
     plist_t displays_0_rotation_node = plist_new_bool(0);
-    plist_t displays_0_refresh_rate_node = plist_new_uint(conn->raop->display_refresh_rate);
-    plist_t displays_0_max_fps_node = plist_new_uint(conn->raop->display_max_fps);
-    plist_t displays_0_overscanned_node = plist_new_bool(conn->raop->display_overscanned);
+    plist_t displays_0_refresh_rate_node = plist_new_uint(conn->raop->refreshRate);
+    plist_t displays_0_max_fps_node = plist_new_uint(conn->raop->maxFPS);
+    plist_t displays_0_overscanned_node = plist_new_bool(conn->raop->overscanned);
     plist_t displays_0_features = plist_new_uint(14);
 
     plist_dict_set_item(displays_0_node, "uuid", displays_0_uuid_node);