diff --git a/net/rxrpc/Makefile b/net/rxrpc/Makefile
index e05a06ef2254..7e1006a3bfa5 100644
--- a/net/rxrpc/Makefile
+++ b/net/rxrpc/Makefile
@@ -4,25 +4,25 @@
 
 af-rxrpc-y := \
 	af_rxrpc.o \
-	ar-accept.o \
-	ar-ack.o \
-	ar-call.o \
-	ar-connection.o \
-	ar-connevent.o \
-	ar-error.o \
-	ar-input.o \
-	ar-key.o \
-	ar-local.o \
-	ar-output.o \
-	ar-peer.o \
-	ar-recvmsg.o \
-	ar-security.o \
-	ar-skbuff.o \
-	ar-transport.o \
+	call_accept.o \
+	call_event.o \
+	call_object.o \
+	conn_event.o \
+	conn_object.o \
+	input.o \
 	insecure.o \
-	misc.o
+	key.o \
+	local_object.o \
+	misc.o \
+	output.o \
+	peer_event.o \
+	peer_object.o \
+	recvmsg.o \
+	security.o \
+	skbuff.o \
+	transport.o
 
-af-rxrpc-$(CONFIG_PROC_FS) += ar-proc.o
+af-rxrpc-$(CONFIG_PROC_FS) += proc.o
 af-rxrpc-$(CONFIG_RXKAD) += rxkad.o
 af-rxrpc-$(CONFIG_SYSCTL) += sysctl.o
 
diff --git a/net/rxrpc/ar-accept.c b/net/rxrpc/call_accept.c
similarity index 100%
rename from net/rxrpc/ar-accept.c
rename to net/rxrpc/call_accept.c
diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/call_event.c
similarity index 100%
rename from net/rxrpc/ar-ack.c
rename to net/rxrpc/call_event.c
diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/call_object.c
similarity index 100%
rename from net/rxrpc/ar-call.c
rename to net/rxrpc/call_object.c
diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/conn_event.c
similarity index 100%
rename from net/rxrpc/ar-connevent.c
rename to net/rxrpc/conn_event.c
diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/conn_object.c
similarity index 100%
rename from net/rxrpc/ar-connection.c
rename to net/rxrpc/conn_object.c
diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/input.c
similarity index 100%
rename from net/rxrpc/ar-input.c
rename to net/rxrpc/input.c
diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/key.c
similarity index 100%
rename from net/rxrpc/ar-key.c
rename to net/rxrpc/key.c
diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/local_object.c
similarity index 100%
rename from net/rxrpc/ar-local.c
rename to net/rxrpc/local_object.c
diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/output.c
similarity index 100%
rename from net/rxrpc/ar-output.c
rename to net/rxrpc/output.c
diff --git a/net/rxrpc/ar-error.c b/net/rxrpc/peer_event.c
similarity index 100%
rename from net/rxrpc/ar-error.c
rename to net/rxrpc/peer_event.c
diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/peer_object.c
similarity index 100%
rename from net/rxrpc/ar-peer.c
rename to net/rxrpc/peer_object.c
diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/proc.c
similarity index 100%
rename from net/rxrpc/ar-proc.c
rename to net/rxrpc/proc.c
diff --git a/net/rxrpc/ar-recvmsg.c b/net/rxrpc/recvmsg.c
similarity index 100%
rename from net/rxrpc/ar-recvmsg.c
rename to net/rxrpc/recvmsg.c
diff --git a/net/rxrpc/ar-security.c b/net/rxrpc/security.c
similarity index 100%
rename from net/rxrpc/ar-security.c
rename to net/rxrpc/security.c
diff --git a/net/rxrpc/ar-skbuff.c b/net/rxrpc/skbuff.c
similarity index 100%
rename from net/rxrpc/ar-skbuff.c
rename to net/rxrpc/skbuff.c
diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/transport.c
similarity index 100%
rename from net/rxrpc/ar-transport.c
rename to net/rxrpc/transport.c