diff --git a/Classes/BITCrashAttachment.h b/Classes/BITCrashAttachment.h
index 482e0c004c..73217a2ac7 100644
--- a/Classes/BITCrashAttachment.h
+++ b/Classes/BITCrashAttachment.h
@@ -43,7 +43,7 @@
 /**
  *  The attachment data as NSData object
  */
-@property (nonatomic, readonly, strong) NSData *attachmentData;
+@property (nonatomic, readonly, strong) NSData *crashAttachmentData;
 
 /**
  *  The content type of your data as MIME type
@@ -60,7 +60,7 @@
  *  @return An instsance of BITCrashAttachment
  */
 - (instancetype)initWithFilename:(NSString *)filename
-                  attachmentData:(NSData *)attachmentData
+             crashAttachmentData:(NSData *)crashAttachmentData
                      contentType:(NSString *)contentType;
 
 @end
diff --git a/Classes/BITCrashAttachment.m b/Classes/BITCrashAttachment.m
index def32d2583..a4f2b17b73 100644
--- a/Classes/BITCrashAttachment.m
+++ b/Classes/BITCrashAttachment.m
@@ -31,12 +31,12 @@
 @implementation BITCrashAttachment
 
 - (instancetype)initWithFilename:(NSString *)filename
-                  attachmentData:(NSData *)attachmentData
+             crashAttachmentData:(NSData *)crashAttachmentData
                      contentType:(NSString *)contentType
 {
   if (self = [super init]) {
     _filename = filename;
-    _attachmentData = attachmentData;
+    _crashAttachmentData = crashAttachmentData;
     _contentType = contentType;
   }
   
@@ -48,14 +48,14 @@
 
 - (void)encodeWithCoder:(NSCoder *)encoder {
   [encoder encodeObject:self.filename forKey:@"filename"];
-  [encoder encodeObject:self.attachmentData forKey:@"data"];
+  [encoder encodeObject:self.crashAttachmentData forKey:@"data"];
   [encoder encodeObject:self.contentType forKey:@"contentType"];
 }
 
 - (id)initWithCoder:(NSCoder *)decoder {
   if ((self = [super init])) {
     _filename = [decoder decodeObjectForKey:@"filename"];
-    _attachmentData = [decoder decodeObjectForKey:@"data"];
+    _crashAttachmentData = [decoder decodeObjectForKey:@"data"];
     _contentType = [decoder decodeObjectForKey:@"contentType"];
   }
   return self;
diff --git a/Classes/BITCrashManager.m b/Classes/BITCrashManager.m
index 18b3aaf270..c9dc2ec7ca 100644
--- a/Classes/BITCrashManager.m
+++ b/Classes/BITCrashManager.m
@@ -1005,7 +1005,7 @@ NSString *const kBITCrashManagerStatus = @"BITCrashManagerStatus";
     
     BITCrashAttachment *attachment = (BITCrashAttachment *)dict[KBITAttachmentDictAttachment];
     
-    [postBody appendData:[BITHockeyAppClient dataWithPostValue:attachment.attachmentData
+    [postBody appendData:[BITHockeyAppClient dataWithPostValue:attachment.crashAttachmentData
                                                         forKey:key
                                                    contentType:attachment.contentType
                                                       boundary:boundary
diff --git a/Classes/BITCrashManagerDelegate.h b/Classes/BITCrashManagerDelegate.h
index c88aef2c93..2697106ad7 100644
--- a/Classes/BITCrashManagerDelegate.h
+++ b/Classes/BITCrashManagerDelegate.h
@@ -66,7 +66,7 @@
        NSData *data = [NSData dataWithContentsOfURL:@"mydatafile"];
  
        BITCrashAttachment *attachment = [[BITCrashAttachment alloc] initWithFilename:@"myfile.data"
-                                                                      attachmentData:data
+                                                                 crashAttachmentData:data
                                                                          contentType:@"'application/octet-stream"];
        return attachment;
      }