diff --git a/attachments/nano_attachment/nano_attachment.c b/attachments/nano_attachment/nano_attachment.c
index 9672196..2008cc7 100755
--- a/attachments/nano_attachment/nano_attachment.c
+++ b/attachments/nano_attachment/nano_attachment.c
@@ -273,7 +273,7 @@ SendDataNanoAttachmentAsync(NanoAttachment *attachment, AttachmentData *data)
 // TODO: Implement
 // Check if the queue is empty, return true if yes - otherwise false.
 bool
-isQueueEmpty(NanoAttachment *attachment)
+isNanoQueueEmpty(NanoAttachment *attachment)
 {
     return false;
 }
@@ -282,8 +282,11 @@ isQueueEmpty(NanoAttachment *attachment)
 // [hash on session id] -> [verdict+modification]
 // Updating the table, and then return the session ID to the caller
 SessionID
-PopFromQueue(NanoAttachment *attachment)
+PopFromNanoQueue(NanoAttachment *attachment)
 {
+    // Pop from queue
+    // Put into hash table.
+
     SessionID session_id = 0;
     return session_id;
 }
diff --git a/core/include/attachments/nano_attachment.h b/core/include/attachments/nano_attachment.h
index f98d5ee..d34dd99 100755
--- a/core/include/attachments/nano_attachment.h
+++ b/core/include/attachments/nano_attachment.h
@@ -295,7 +295,7 @@ freeCompressedBody(
 ///
 /// @return Returns true if the queue is empty, false otherwise.
 ///
-bool isQueueEmpty(NanoAttachment *attachment);
+bool isNanoQueueEmpty(NanoAttachment *attachment);
 
 ///
 /// @brief Pops a session ID from the queue and updates the table.
@@ -304,7 +304,7 @@ bool isQueueEmpty(NanoAttachment *attachment);
 ///
 /// @return The session ID that was popped from the queue.
 ///
-SessionID PopFromQueue(NanoAttachment *attachment);
+SessionID PopFromNanoQueue(NanoAttachment *attachment);
 
 ///
 /// @brief Retrieves a verdict response for a given session ID from the table.