diff --git a/test/qcbor_decode_tests.c b/test/qcbor_decode_tests.c
index 26ed048..2780097 100644
--- a/test/qcbor_decode_tests.c
+++ b/test/qcbor_decode_tests.c
@@ -5906,16 +5906,15 @@
   array
      7
      8
-
  */
 
-static UsefulBufC foo(UsefulBuf ffo)
+static UsefulBufC EncodeBstrWrapTestData(UsefulBuf OutputBuffer)
 {
-   UsefulBufC Encoded;
+   UsefulBufC         Encoded;
    QCBOREncodeContext EC;
-   QCBORError uErr;
+   QCBORError         uErr;
 
-   QCBOREncode_Init(&EC, ffo);
+   QCBOREncode_Init(&EC, OutputBuffer);
 
    QCBOREncode_BstrWrap(&EC);
      QCBOREncode_OpenMap(&EC);
@@ -5949,34 +5948,34 @@
 
 int32_t EnterBstrTest()
 {
-   MakeUsefulBufOnStack(ffo, 100);
+   MakeUsefulBufOnStack(OutputBuffer, 100);
 
    QCBORDecodeContext DC;
 
-   QCBORDecode_Init(&DC, foo(ffo), 0);
+   QCBORDecode_Init(&DC, EncodeBstrWrapTestData(OutputBuffer), 0);
 
-   int64_t i1, i2, i3, i4, i5, i6, i7, i8;
+   int64_t n1, n2, n3, n4, n5, n6, n7, n8;
 
 
    QCBORDecode_EnterBstrWrapped(&DC, QCBOR_TAG_REQUIREMENT_NOT_A_TAG, NULL);
      QCBORDecode_EnterMap(&DC);
-       QCBORDecode_GetInt64InMapN(&DC, 100, &i1);
-       QCBORDecode_GetInt64InMapN(&DC, 200, &i2);
+       QCBORDecode_GetInt64InMapN(&DC, 100, &n1);
+       QCBORDecode_GetInt64InMapN(&DC, 200, &n2);
      QCBORDecode_ExitMap(&DC);
      QCBORDecode_EnterBstrWrapped(&DC, QCBOR_TAG_REQUIREMENT_NOT_A_TAG, NULL);
        QCBORDecode_EnterArray(&DC);
-         QCBORDecode_GetInt64(&DC, &i3);
+         QCBORDecode_GetInt64(&DC, &n3);
          QCBORDecode_EnterBstrWrapped(&DC, QCBOR_TAG_REQUIREMENT_NOT_A_TAG, NULL);
-           QCBORDecode_GetInt64(&DC, &i4);
+           QCBORDecode_GetInt64(&DC, &n4);
          QCBORDecode_ExitBstrWrapped(&DC);
-         QCBORDecode_GetInt64(&DC, &i5);
+         QCBORDecode_GetInt64(&DC, &n5);
        QCBORDecode_ExitArray(&DC);
      QCBORDecode_ExitBstrWrapped(&DC);
-     QCBORDecode_GetInt64(&DC, &i6);
+     QCBORDecode_GetInt64(&DC, &n6);
    QCBORDecode_ExitBstrWrapped(&DC);
    QCBORDecode_EnterArray(&DC);
-     QCBORDecode_GetInt64(&DC, &i7);
-     QCBORDecode_GetInt64(&DC, &i8);
+     QCBORDecode_GetInt64(&DC, &n7);
+     QCBORDecode_GetInt64(&DC, &n8);
    QCBORDecode_ExitArray(&DC);
 
    QCBORError uErr = QCBORDecode_Finish(&DC);