diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SignalServiceAttachment.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt
similarity index 85%
rename from libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SignalServiceAttachment.kt
rename to libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt
index 7c8a1f2543..800bbed060 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SignalServiceAttachment.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt
@@ -5,7 +5,7 @@ import org.session.libsignal.libsignal.util.guava.Optional
 import org.session.libsignal.service.api.messages.SignalServiceAttachment
 import java.io.InputStream
 
-abstract class SignalServiceAttachment protected constructor(val contentType: String?) {
+abstract class SessionServiceAttachment protected constructor(val contentType: String?) {
 
     var attachmentId: Long = 0
     var isGif: Boolean = false
@@ -17,12 +17,12 @@ abstract class SignalServiceAttachment protected constructor(val contentType: St
 
     abstract fun isStream(): Boolean
     abstract fun isPointer(): Boolean
-    fun asStream(): SignalServiceAttachmentStream {
-        return this as SignalServiceAttachmentStream
+    fun asStream(): SessionServiceAttachmentStream {
+        return this as SessionServiceAttachmentStream
     }
 
-    fun asPointer(): SignalServiceAttachmentPointer {
-        return this as SignalServiceAttachmentPointer
+    fun asPointer(): SessionServiceAttachmentPointer {
+        return this as SessionServiceAttachmentPointer
     }
 
     fun shouldHaveImageSize(): Boolean {
@@ -84,11 +84,11 @@ abstract class SignalServiceAttachment protected constructor(val contentType: St
             return this
         }
 
-        fun build(): SignalServiceAttachmentStream {
+        fun build(): SessionServiceAttachmentStream {
             requireNotNull(inputStream) { "Must specify stream!" }
             requireNotNull(contentType) { "No content type specified!" }
             require(length != 0L) { "No length specified!" }
-            return SignalServiceAttachmentStream(inputStream, contentType, length, Optional.fromNullable(fileName), voiceNote, Optional.absent(), width, height, Optional.fromNullable(caption), listener)
+            return SessionServiceAttachmentStream(inputStream, contentType, length, Optional.fromNullable(fileName), voiceNote, Optional.absent(), width, height, Optional.fromNullable(caption), listener)
         }
     }
 
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SignalServiceAttachmentPointer.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt
similarity index 51%
rename from libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SignalServiceAttachmentPointer.kt
rename to libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt
index 07f39e2609..ece1b30c3d 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SignalServiceAttachmentPointer.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt
@@ -6,7 +6,6 @@
 package org.session.libsession.messaging.sending_receiving.attachments
 
 import org.session.libsignal.libsignal.util.guava.Optional
-import org.session.libsignal.service.api.messages.SignalServiceAttachment
 
 /**
  * Represents a received SignalServiceAttachment "handle."  This
@@ -15,11 +14,11 @@ import org.session.libsignal.service.api.messages.SignalServiceAttachment
  *
  * @author Moxie Marlinspike
  */
-class SignalServiceAttachmentPointer(val id: Long, contentType: String?, val key: ByteArray?,
-                                     val size: Optional<Int>, val preview: Optional<ByteArray>,
-                                     val width: Int, val height: Int,
-                                     val digest: Optional<ByteArray>, val fileName: Optional<String>,
-                                     val voiceNote: Boolean, val caption: Optional<String>, val url: String) : SignalServiceAttachment(contentType) {
+class SessionServiceAttachmentPointer(val id: Long, contentType: String?, key: ByteArray?,
+                                      val size: Optional<Int>, val preview: Optional<ByteArray>,
+                                      val width: Int, val height: Int,
+                                      val digest: Optional<ByteArray>, val fileName: Optional<String>,
+                                      val voiceNote: Boolean, val caption: Optional<String>, url: String) : SessionServiceAttachment(contentType) {
     override fun isStream(): Boolean {
         return false
     }
diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SignalServiceAttachmentStream.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt
similarity index 88%
rename from libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SignalServiceAttachmentStream.kt
rename to libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt
index 24fd214bee..caebe874a6 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SignalServiceAttachmentStream.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt
@@ -16,7 +16,7 @@ import kotlin.math.round
 /**
  * Represents a local SignalServiceAttachment to be sent.
  */
-class SignalServiceAttachmentStream(val inputStream: InputStream?, contentType: String?, val length: Long, val fileName: Optional<String?>?, val voiceNote: Boolean, val preview: Optional<ByteArray?>, val width: Int, val height: Int, val caption: Optional<String?>, val listener: SAttachment.ProgressListener?) : SignalServiceAttachment(contentType) {
+class SessionServiceAttachmentStream(val inputStream: InputStream?, contentType: String?, val length: Long, val fileName: Optional<String?>?, val voiceNote: Boolean, val preview: Optional<ByteArray?>, val width: Int, val height: Int, val caption: Optional<String?>, val listener: SAttachment.ProgressListener?) : SessionServiceAttachment(contentType) {
 
     constructor(inputStream: InputStream?, contentType: String?, length: Long, fileName: Optional<String?>?, voiceNote: Boolean, listener: SAttachment.ProgressListener?) : this(inputStream, contentType, length, fileName, voiceNote, Optional.absent<ByteArray?>(), 0, 0, Optional.absent<String?>(), listener) {}