5 files changed, 7 insertions, 5 deletions
diff --git a/README.markdown b/README.markdown
index 5180617..1573322 100644
--- a/README.markdown
+++ b/README.markdown
@@ -48,7 +48,7 @@ and do one or more of the following:
  1. Parse a JSON string into its Abstract Syntax Tree (AST) representation
 ```scala
 val source = """{ "some": "JSON source" }"""
-val jsonAst = source.asJson // or JsonParser(source)
+val jsonAst = source.parseJson // or JsonParser(source)
 ```
 
  2. Print a JSON AST back to a String using either the `CompactPrinter` or the `PrettyPrinter`
diff --git a/src/main/scala/spray/json/package.scala b/src/main/scala/spray/json/package.scala
index 5bf5714..fe37c8b 100644
--- a/src/main/scala/spray/json/package.scala
+++ b/src/main/scala/spray/json/package.scala
@@ -40,6 +40,8 @@ package json {
   }
 
   private[json] class PimpedString(string: String) {
-    def asJson: JsValue = JsonParser(string)
+    @deprecated("deprecated in favor of parseJson", "1.2.6")
+    def asJson: JsValue = parseJson
+    def parseJson: JsValue = JsonParser(string)
   }
 }
 \ No newline at end of file
diff --git a/src/test/scala/spray/json/AdditionalFormatsSpec.scala b/src/test/scala/spray/json/AdditionalFormatsSpec.scala
index 7129fdf..eafceb2 100644
--- a/src/test/scala/spray/json/AdditionalFormatsSpec.scala
+++ b/src/test/scala/spray/json/AdditionalFormatsSpec.scala
@@ -51,7 +51,7 @@ class AdditionalFormatsSpec extends Specification {
 
     "properly read a Container[Container[List[Int]]] from JSON" in {
       import ReaderProtocol._
-      """{"content":{"content":[1,2,3]}}""".asJson.convertTo[Container[Container[List[Int]]]] mustEqual obj
+      """{"content":{"content":[1,2,3]}}""".parseJson.convertTo[Container[Container[List[Int]]]] mustEqual obj
     }
   }
 
diff --git a/src/test/scala/spray/json/CustomFormatSpec.scala b/src/test/scala/spray/json/CustomFormatSpec.scala
index dcea4f2..2397abc 100644
--- a/src/test/scala/spray/json/CustomFormatSpec.scala
+++ b/src/test/scala/spray/json/CustomFormatSpec.scala
@@ -35,7 +35,7 @@ class CustomFormatSpec extends Specification with DefaultJsonProtocol {
   "A custom JsonFormat built with 'asJsonObject'" should {
     val value = MyType("bob", 42)
     "correctly deserialize valid JSON content" in {
-      """{ "name": "bob", "value": 42 }""".asJson.convertTo[MyType] mustEqual value
+      """{ "name": "bob", "value": 42 }""".parseJson.convertTo[MyType] mustEqual value
     }
     "support full round-trip (de)serialization" in {
       value.toJson.convertTo[MyType] mustEqual value
diff --git a/src/test/scala/spray/json/ReadmeSpec.scala b/src/test/scala/spray/json/ReadmeSpec.scala
index 89d3dbc..51a1ec5 100644
--- a/src/test/scala/spray/json/ReadmeSpec.scala
+++ b/src/test/scala/spray/json/ReadmeSpec.scala
@@ -25,7 +25,7 @@ class ReadmeSpec extends Specification {
       import DefaultJsonProtocol._
       
       val source = """{ "some": "JSON source" }"""
-      val jsonAst = source.asJson
+      val jsonAst = source.parseJson
       jsonAst mustEqual JsObject("some" -> JsString("JSON source"))
       
       val json2 = jsonAst.prettyPrint