diff --git a/token.cpp b/token.cpp
index 4845c1a..e063067 100644
--- a/token.cpp
+++ b/token.cpp
@@ -497,7 +497,7 @@ void *Token::operator new(size_t size)
 		token = (Token *)::operator new(size);
 
 		// set index into used vector and add to vector
-		token->index = s_used.size();
+		token->m_id = s_used.size();
 		s_used.append(token);
 	}
 	else  // get a token from the free stack
@@ -505,7 +505,7 @@ void *Token::operator new(size_t size)
 		token = s_freeStack.pop();
 
 		// mark token as used
-		s_used[token->index] = token;
+		s_used[token->m_id] = token;
 	}
 
 	// return pointer to new token
@@ -526,14 +526,14 @@ void Token::operator delete(void *ptr)
 	{
 		Token *token = (Token *)ptr;
 
-		if (s_used[token->index] == NULL)  // already deleted?
+		if (s_used[token->m_id] == NULL)  // already deleted?
 		{
-			s_deleted.append(QString("%1: %2").arg(token->index)
+			s_deleted.append(QString("%1: %2").arg(token->m_id)
 				.arg(token->text()));
 		}
 		else  // mark token as unused and cache on free stack
 		{
-			s_used[token->index] = NULL;
+			s_used[token->m_id] = NULL;
 			s_freeStack.push(token);
 		}
 	}
diff --git a/token.h b/token.h
index e50ba17..970bd24 100644
--- a/token.h
+++ b/token.h
@@ -54,7 +54,7 @@ class Token
 {
 	Q_DECLARE_TR_FUNCTIONS(Token)
 
-	int index;				// private index for detecting token leaks
+	int m_id;				// private ID (index) for detecting token leaks
 	int m_column;			// start column of token
 	int m_length;			// length of token
 	TokenType m_type;		// type of the token