diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 63793ceb..42ba64b8 100644
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -541,7 +541,7 @@ ostree_get_relative_object_path (const char *checksum,
     {
     case OSTREE_OBJECT_TYPE_FILE:
       if (archive)
-        type_string = ".packfile";
+        type_string = ".archive";
       else
         type_string = ".file";
       break;
@@ -714,7 +714,7 @@ ostree_parse_packed_file (GFile            *file,
   if (bytes_read != 4)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Corrupted packfile; too short while reading metadata length");
+                   "Corrupted archive file; too short while reading metadata length");
       goto out;
     }
       
@@ -722,7 +722,7 @@ ostree_parse_packed_file (GFile            *file,
   if (metadata_len > OSTREE_MAX_METADATA_SIZE)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Corrupted packfile; metadata length %u is larger than maximum %u",
+                   "Corrupted archive file; metadata length %u is larger than maximum %u",
                    metadata_len, OSTREE_MAX_METADATA_SIZE);
       goto out;
     }
@@ -733,7 +733,7 @@ ostree_parse_packed_file (GFile            *file,
   if (bytes_read != metadata_len)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Corrupted packfile; too short while reading metadata");
+                   "Corrupted archive file; too short while reading metadata");
       goto out;
     }
 
@@ -785,7 +785,7 @@ ostree_parse_packed_file (GFile            *file,
       if (bytes_read != 4)
         {
           g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                       "Corrupted packfile; too short while reading device id");
+                       "Corrupted archive file; too short while reading device id");
           goto out;
         }
       dev = GUINT32_FROM_BE (dev);
@@ -801,7 +801,7 @@ ostree_parse_packed_file (GFile            *file,
   else
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Corrupted packfile; invalid mode %u", mode);
+                   "Corrupted archive file; invalid mode %u", mode);
       goto out;
     }
 
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 745d7a43..43e436f8 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -1919,7 +1919,7 @@ iter_object_dir (OstreeRepo             *self,
       if (g_str_has_suffix (name, ".meta"))
         objtype = OSTREE_OBJECT_TYPE_META;
       else if (g_str_has_suffix (name, ".file")
-               || g_str_has_suffix (name, ".packfile"))
+               || g_str_has_suffix (name, ".archive"))
         objtype = OSTREE_OBJECT_TYPE_FILE;
       else
         goto loop_out;
diff --git a/src/ostree/ot-builtin-fsck.c b/src/ostree/ot-builtin-fsck.c
index 8f65db61..f73f5e93 100644
--- a/src/ostree/ot-builtin-fsck.c
+++ b/src/ostree/ot-builtin-fsck.c
@@ -129,10 +129,10 @@ object_iter_callback (OstreeRepo    *repo,
   if (ostree_repo_get_mode (repo) == OSTREE_REPO_MODE_ARCHIVE
       && objtype == OSTREE_OBJECT_TYPE_FILE)
     {
-      if (!g_str_has_suffix (path, ".packfile"))
+      if (!g_str_has_suffix (path, ".archive"))
         {
           g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                       "Invalid unpacked filename '%s'",
+                       "Invalid archive filename '%s'",
                        path);
           goto out;
         }