diff --git a/src/AprsService.scala b/src/AprsService.scala
index 052d26e..2f3df9b 100644
--- a/src/AprsService.scala
+++ b/src/AprsService.scala
@@ -160,9 +160,9 @@ class AprsService extends Service with LocationListener {
 		try {
 			var poster : AprsIsUploader = null
 			if (prefs.getString("conntype", "http") == "udp")
-				poster = new AprsUdp()
+				poster = new UdpUploader()
 			else
-				poster = new AprsHttpPost()
+				poster = new HttpPostUploader()
 			val status = poster.update(hostname, login, packet)
 			i.putExtra(STATUS, status)
 			i.putExtra(PACKET, packet)
diff --git a/src/AprsHttpPost.scala b/src/HttpPostUploader.scala
similarity index 95%
rename from src/AprsHttpPost.scala
rename to src/HttpPostUploader.scala
index 0afb5b1..a7f5b21 100644
--- a/src/AprsHttpPost.scala
+++ b/src/HttpPostUploader.scala
@@ -8,7 +8,7 @@ import _root_.org.apache.http.entity.StringEntity
 import _root_.org.apache.http.impl.client.DefaultHttpClient
 import _root_.org.apache.http.client.methods.HttpPost
 
-class AprsHttpPost extends AprsIsUploader {
+class HttpPostUploader extends AprsIsUploader {
 	val TAG = "AprsHttpPost"
 
 	def start() {
diff --git a/src/AprsUdp.scala b/src/UdpUploader.scala
similarity index 93%
rename from src/AprsUdp.scala
rename to src/UdpUploader.scala
index 9d76e81..079ab9d 100644
--- a/src/AprsUdp.scala
+++ b/src/UdpUploader.scala
@@ -5,7 +5,7 @@ import _root_.android.preference.PreferenceManager
 import _root_.android.util.Log
 import _root_.java.net.{InetAddress, DatagramSocket, DatagramPacket}
 
-class AprsUdp extends AprsIsUploader {
+class UdpUploader extends AprsIsUploader {
 	val TAG = "AprsUdp"
 	lazy val socket = new DatagramSocket()