diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
index 55ab148..cda7b57 100644
--- a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
+++ b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
@@ -48,12 +48,12 @@ public class JavaParser extends Parser<JavaElement> {
 					for(int i = 0; i < line.length(); i++){
 						char c = line.charAt(i);
 						Token token;
-						if(Character.isAlphabetic(c) || Character.isDigit(c)){
+						if(isNameValid(c)){
 							String value = "";
 							int j = i;
 							for(; j < line.length(); j++){
 								c = line.charAt(j);
-								if(Character.isAlphabetic(c) || Character.isDigit(c)) value+=c;
+								if(isNameValid(c)) value+=c;
 								else break;
 							}
 							token = new Token(lineNumber, i+1, value, TokenType.NAME);
@@ -67,8 +67,13 @@ public class JavaParser extends Parser<JavaElement> {
 					}
 				}
 			}
+			
+			private boolean isNameValid(char c) {
+				return Character.isAlphabetic(c) || Character.isDigit(c) || c == '_' || c == '$';
+			}
 		};
 		
+		
 		//SUMMARY
 		//- Modifier
 		//- Type