Index: tests/natools-s_expressions-atom_buffers-tests.adb
==================================================================
--- tests/natools-s_expressions-atom_buffers-tests.adb
+++ tests/natools-s_expressions-atom_buffers-tests.adb
@@ -361,14 +361,14 @@
                Report.Item (Name, NT.Fail);
                Report.Info ("Soft reset changed storage area");
                return;
             end if;
 
-            if Buffer.Raw_Query.Data.all'Length /= Buffer.Available then
+            if Buffer.Raw_Query.Data.all'Length /= Buffer.Capacity then
                Report.Item (Name, NT.Fail);
                Report.Info ("Available length inconsistency, recorded"
-                 & Count'Image (Buffer.Available) & ", actual"
+                 & Count'Image (Buffer.Capacity) & ", actual"
                  & Count'Image (Buffer.Raw_Query.Data.all'Length));
                return;
             end if;
 
             if Buffer.Data'Length /= Buffer.Used then
@@ -385,11 +385,11 @@
          end loop;
 
          Buffer.Hard_Reset;
 
          if Buffer.Length /= 0
-           or else Buffer.Available /= 0
+           or else Buffer.Capacity /= 0
            or else not Buffer.Ref.Is_Empty
          then
             Report.Item (Name, NT.Fail);
             Report.Info ("Hard reset did not completely clean structure");
          end if;