diff --git a/src/language/parser.js b/src/language/parser.js
index 5ec9b14c7c..4ba2a1ecd1 100644
--- a/src/language/parser.js
+++ b/src/language/parser.js
@@ -172,29 +172,29 @@ function parseOperationDefinition(parser): OperationDefinition {
     kind: OPERATION_DEFINITION,
     operation,
     name: parseName(parser),
-    variableDefinitions: parseValueDefinitions(parser),
+    variableDefinitions: parseVariableDefinitions(parser),
     directives: parseDirectives(parser),
     selectionSet: parseSelectionSet(parser),
     loc: loc(parser, start)
   };
 }
 
-function parseValueDefinitions(parser): Array<VariableDefinition> {
+function parseVariableDefinitions(parser): Array<VariableDefinition> {
   return peek(parser, TokenKind.PAREN_L) ?
     many(
       parser,
       TokenKind.PAREN_L,
-      parseValueDefinition,
+      parseVariableDefinition,
       TokenKind.PAREN_R
     ) :
     [];
 }
 
-function parseValueDefinition(parser): VariableDefinition {
+function parseVariableDefinition(parser): VariableDefinition {
   var start = parser.token.start;
   return {
     kind: VARIABLE_DEFINITION,
-    variable: parseValue(parser),
+    variable: parseVariable(parser),
     type: (expect(parser, TokenKind.COLON), parseType(parser)),
     defaultValue:
       skip(parser, TokenKind.EQUALS) ? parseValueLiteral(parser, true) : null,
@@ -202,7 +202,7 @@ function parseValueDefinition(parser): VariableDefinition {
   };
 }
 
-function parseValue(parser): Variable {
+function parseVariable(parser): Variable {
   var start = parser.token.start;
   expect(parser, TokenKind.DOLLAR);
   return {
@@ -378,7 +378,7 @@ function parseValueLiteral(parser, isConst: boolean): Value {
       break;
     case TokenKind.DOLLAR:
       if (!isConst) {
-        return parseValue(parser);
+        return parseVariable(parser);
       }
       break;
   }
diff --git a/src/type/definition.js b/src/type/definition.js
index 07e0bdb335..186c97b373 100644
--- a/src/type/definition.js
+++ b/src/type/definition.js
@@ -197,7 +197,7 @@ export class GraphQLScalarType/* <T> */ {
 
   parseLiteral(valueAST: Value): ?any/* T */ {
     var parser = this._scalarConfig.parseLiteral;
-    return parser ? parser(value) : null;
+    return parser ? parser(valueAST) : null;
   }
 
   toString(): string {
@@ -655,8 +655,8 @@ export class GraphQLEnumType/* <T> */ {
   }
 
   parseLiteral(valueAST: Value): ?any/* T */ {
-    if (value.kind === ENUM) {
-      var enumValue = this._getNameLookup().get(value.value);
+    if (valueAST.kind === ENUM) {
+      var enumValue = this._getNameLookup().get(valueAST.value);
       if (enumValue) {
         return enumValue.value;
       }