diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
+2016-07-24 v0.5.2
+	* Move annotations from the `RdrName` to `HsVar` and `PatVar` for
+	consistency.
+
 2016-06-03 v0.5.1.1
-	* Fixx haddocks for GHC 8.0 (@phadej)
+	* Fix haddocks for GHC 8.0 (@phadej)
 	* Add test files for ghc710-only to dist tarball (#41)
 2016-06-02 v0.5.1.0
 	* Support for GHC 8.0.1
diff --git a/ghc-exactprint.cabal b/ghc-exactprint.cabal
--- a/ghc-exactprint.cabal
+++ b/ghc-exactprint.cabal
@@ -1,5 +1,5 @@
 name:                ghc-exactprint
-version:             0.5.1.1
+version:             0.5.2
 synopsis:            ExactPrint for GHC
 description:         Using the API Annotations available from GHC 7.10.2, this
                      library provides a means to round trip any code that can
diff --git a/src/Language/Haskell/GHC/ExactPrint/Annotate.hs b/src/Language/Haskell/GHC/ExactPrint/Annotate.hs
--- a/src/Language/Haskell/GHC/ExactPrint/Annotate.hs
+++ b/src/Language/Haskell/GHC/ExactPrint/Annotate.hs
@@ -1704,7 +1704,7 @@
 #if __GLASGOW_HASKELL__ <= 710
     markAST l n
 #else
-    markLocated n
+    markAST l (GHC.unLoc n)
 #endif
   markAST _ (GHC.LazyPat p) = do
     mark GHC.AnnTilde
@@ -2041,14 +2041,14 @@
 #if __GLASGOW_HASKELL__ <= 710
   markAST l (GHC.HsVar n)           = markAST l n
 #else
-  markAST l (GHC.HsVar n)           = markLocated n
+  markAST l (GHC.HsVar n)           = markAST l (GHC.unLoc n)
 #endif
 
 #if __GLASGOW_HASKELL__ <= 710
 #else
   markAST l (GHC.HsRecFld f) = markAST l f
 
-  markAST l (GHC.HsOverLabel fs) 
+  markAST l (GHC.HsOverLabel fs)
     = markExternal l GHC.AnnVal ("#" ++ GHC.unpackFS fs)
 #endif
 
diff --git a/tests/examples/ghc710/NegLit.hs b/tests/examples/ghc710/NegLit.hs
new file mode 100644
--- /dev/null
+++ b/tests/examples/ghc710/NegLit.hs
@@ -0,0 +1,1 @@
+a = -b/c
diff --git a/tests/examples/ghc710/OldQuasiQuote.hs b/tests/examples/ghc710/OldQuasiQuote.hs
new file mode 100644
--- /dev/null
+++ b/tests/examples/ghc710/OldQuasiQuote.hs
@@ -0,0 +1,3 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+foo = [$qq| string|]