diff --git a/drivers/staging/hv/ChannelMgmt.h b/drivers/staging/hv/ChannelMgmt.h
index fa973d86b624810eaf06a799c64f54453696deae..9219199d0e5a22d6df06128d68e4900d94d0e249 100644
--- a/drivers/staging/hv/ChannelMgmt.h
+++ b/drivers/staging/hv/ChannelMgmt.h
@@ -27,7 +27,7 @@
 
 #include <linux/list.h>
 #include <linux/timer.h>
-#include "RingBuffer.h"
+#include "ring_buffer.h"
 #include "VmbusChannelInterface.h"
 #include "VmbusPacketFormat.h"
 
diff --git a/drivers/staging/hv/Makefile b/drivers/staging/hv/Makefile
index 91955095f9e8be7f7c93f6cf4f6439ad0a3eb046..faa8db1d86c03ca855b142ac560edb67307ddae8 100644
--- a/drivers/staging/hv/Makefile
+++ b/drivers/staging/hv/Makefile
@@ -6,7 +6,7 @@ obj-$(CONFIG_HYPERV_UTILS)	+= hv_utils.o
 
 hv_vmbus-objs := vmbus_drv.o osd.o \
 		 Vmbus.o hv.o connection.o channel.o \
-		 ChannelMgmt.o ChannelInterface.o RingBuffer.o
+		 ChannelMgmt.o ChannelInterface.o ring_buffer.o
 hv_storvsc-objs := storvsc_drv.o StorVsc.o
 hv_blkvsc-objs := blkvsc_drv.o BlkVsc.o
 hv_netvsc-objs := netvsc_drv.o NetVsc.o RndisFilter.o
diff --git a/drivers/staging/hv/VmbusPrivate.h b/drivers/staging/hv/VmbusPrivate.h
index f03db0b6e887cf6e5879308b923f3a66e5dc1cb7..d73baff99a7e4c80ba41353ee187a9074420b0ee 100644
--- a/drivers/staging/hv/VmbusPrivate.h
+++ b/drivers/staging/hv/VmbusPrivate.h
@@ -30,7 +30,7 @@
 #include "channel.h"
 #include "ChannelMgmt.h"
 #include "ChannelInterface.h"
-#include "RingBuffer.h"
+#include "ring_buffer.h"
 #include <linux/list.h>
 
 
diff --git a/drivers/staging/hv/RingBuffer.c b/drivers/staging/hv/ring_buffer.c
similarity index 99%
rename from drivers/staging/hv/RingBuffer.c
rename to drivers/staging/hv/ring_buffer.c
index 64f8d0f9e05cf3d0f3e4994b62966afd206cead2..ae2a10e24d92eabf21f9eb84049cd4ed48088719 100644
--- a/drivers/staging/hv/RingBuffer.c
+++ b/drivers/staging/hv/ring_buffer.c
@@ -25,7 +25,7 @@
 #include <linux/mm.h>
 #include "osd.h"
 #include "logging.h"
-#include "RingBuffer.h"
+#include "ring_buffer.h"
 
 
 /* #defines */
diff --git a/drivers/staging/hv/RingBuffer.h b/drivers/staging/hv/ring_buffer.h
similarity index 100%
rename from drivers/staging/hv/RingBuffer.h
rename to drivers/staging/hv/ring_buffer.h