diff --git a/lib/httparrot.ex b/lib/httparrot.ex
index b9df28b..9db1ace 100644
--- a/lib/httparrot.ex
+++ b/lib/httparrot.ex
@@ -57,8 +57,8 @@ defmodule HTTParrot do
   def stop(_State), do: :ok
 
   def prettify_json(status, headers, body, req) do
-    if JSEX.is_json? body do
-      body = JSEX.prettify!(body)
+    if JSX.is_json? body do
+      body = JSX.prettify!(body)
       headers = List.keystore(headers, "content-length", 0, {"content-length", Integer.to_char_list(String.length(body))})
       {:ok, req} = :cowboy_req.reply(status, headers, body, req)
     end
diff --git a/lib/httparrot/basic_auth_handler.ex b/lib/httparrot/basic_auth_handler.ex
index 316fb13..b3a6ca7 100644
--- a/lib/httparrot/basic_auth_handler.ex
+++ b/lib/httparrot/basic_auth_handler.ex
@@ -23,6 +23,6 @@ defmodule HTTParrot.BasicAuthHandler do
   end
 
   defp response(user) do
-    [authenticated: true, user: user] |> JSEX.encode!
+    [authenticated: true, user: user] |> JSX.encode!
   end
 end
diff --git a/lib/httparrot/cache_handler.ex b/lib/httparrot/cache_handler.ex
index 263c77b..34b0eb7 100644
--- a/lib/httparrot/cache_handler.ex
+++ b/lib/httparrot/cache_handler.ex
@@ -19,6 +19,6 @@ defmodule HTTParrot.CacheHandler do
   end
 
   defp response(info) do
-    info |> JSEX.encode!
+    info |> JSX.encode!
   end
 end
diff --git a/lib/httparrot/cookies_handler.ex b/lib/httparrot/cookies_handler.ex
index fb8a3de..c092d78 100644
--- a/lib/httparrot/cookies_handler.ex
+++ b/lib/httparrot/cookies_handler.ex
@@ -15,6 +15,6 @@ defmodule HTTParrot.CookiesHandler do
   end
 
   defp response(cookies) do
-    [cookies: cookies] |> JSEX.encode!
+    [cookies: cookies] |> JSX.encode!
   end
 end
diff --git a/lib/httparrot/delayed_handler.ex b/lib/httparrot/delayed_handler.ex
index 6de872a..1f65914 100644
--- a/lib/httparrot/delayed_handler.ex
+++ b/lib/httparrot/delayed_handler.ex
@@ -23,6 +23,6 @@ defmodule HTTParrot.DelayedHandler do
   end
 
   defp response(info) do
-    info |> JSEX.encode!
+    info |> JSX.encode!
   end
 end
diff --git a/lib/httparrot/delete_handler.ex b/lib/httparrot/delete_handler.ex
index 866534f..41c173a 100644
--- a/lib/httparrot/delete_handler.ex
+++ b/lib/httparrot/delete_handler.ex
@@ -12,6 +12,6 @@ defmodule HTTParrot.DeleteHandler do
   end
 
   defp response(info) do
-    info |> JSEX.encode!
+    info |> JSX.encode!
   end
 end
diff --git a/lib/httparrot/get_handler.ex b/lib/httparrot/get_handler.ex
index 43edf7a..5aacfc4 100644
--- a/lib/httparrot/get_handler.ex
+++ b/lib/httparrot/get_handler.ex
@@ -15,6 +15,6 @@ defmodule HTTParrot.GetHandler do
   end
 
   defp response(info) do
-    info |> JSEX.encode!
+    info |> JSX.encode!
   end
 end
diff --git a/lib/httparrot/gzip_handler.ex b/lib/httparrot/gzip_handler.ex
index 3d3fb1e..2cb5b1c 100644
--- a/lib/httparrot/gzip_handler.ex
+++ b/lib/httparrot/gzip_handler.ex
@@ -12,11 +12,11 @@ defmodule HTTParrot.GzipHandler do
   def get_json(req, state) do
     {info, req} = GeneralRequestInfo.retrieve(req)
     req = :cowboy_req.set_resp_header("content-encoding", "gzip", req)
-    response = response(info) |> JSEX.prettify!  |> :zlib.gzip
+    response = response(info) |> JSX.prettify!  |> :zlib.gzip
     {response, req, state}
   end
 
   defp response(info) do
-    info |> JSEX.encode!
+    info |> JSX.encode!
   end
 end
diff --git a/lib/httparrot/headers_handler.ex b/lib/httparrot/headers_handler.ex
index 69f15b1..b2303f2 100644
--- a/lib/httparrot/headers_handler.ex
+++ b/lib/httparrot/headers_handler.ex
@@ -11,6 +11,6 @@ defmodule HTTParrot.HeadersHandler do
   end
 
   defp response(headers) do
-    [headers: headers] |> JSEX.encode!
+    [headers: headers] |> JSX.encode!
   end
 end
diff --git a/lib/httparrot/hidden_basic_auth_handler.ex b/lib/httparrot/hidden_basic_auth_handler.ex
index dfbb5ca..c46ebdb 100644
--- a/lib/httparrot/hidden_basic_auth_handler.ex
+++ b/lib/httparrot/hidden_basic_auth_handler.ex
@@ -26,6 +26,6 @@ defmodule HTTParrot.HiddenBasicAuthHandler do
   end
 
   defp response(user) do
-    [authenticated: true, user: user] |> JSEX.encode!
+    [authenticated: true, user: user] |> JSX.encode!
   end
 end
diff --git a/lib/httparrot/ip_handler.ex b/lib/httparrot/ip_handler.ex
index d2458bb..262f616 100644
--- a/lib/httparrot/ip_handler.ex
+++ b/lib/httparrot/ip_handler.ex
@@ -15,6 +15,6 @@ defmodule HTTParrot.IPHandler do
 
   defp response(ip) do
     ip = :inet_parse.ntoa(ip) |> to_string
-    [origin: ip] |> JSEX.encode!
+    [origin: ip] |> JSX.encode!
   end
 end
diff --git a/lib/httparrot/p_handler.ex b/lib/httparrot/p_handler.ex
index db6ac32..1277188 100644
--- a/lib/httparrot/p_handler.ex
+++ b/lib/httparrot/p_handler.ex
@@ -37,8 +37,8 @@ defmodule HTTParrot.PHandler do
   def post_binary(req, _state) do
     {:ok, body, req} = handle_binary(req)
     if String.valid?(body) do
-      if JSEX.is_json?(body) do
-        post(req, [form: [{}], data: body, json: JSEX.decode!(body)])
+      if JSX.is_json?(body) do
+        post(req, [form: [{}], data: body, json: JSX.decode!(body)])
       else
         post(req, [form: [{}], data: body, json: nil])
       end
@@ -65,7 +65,7 @@ defmodule HTTParrot.PHandler do
   end
 
   defp response(info, body) do
-    info ++ body |> JSEX.encode!
+    info ++ body |> JSX.encode!
   end
 
   def post_multipart(req, _state) do
diff --git a/lib/httparrot/stream_handler.ex b/lib/httparrot/stream_handler.ex
index 42acdeb..f5f00ea 100644
--- a/lib/httparrot/stream_handler.ex
+++ b/lib/httparrot/stream_handler.ex
@@ -30,7 +30,7 @@ defmodule HTTParrot.StreamHandler do
   defp stream_response(n, info) do
     fn(send_func) ->
       Enum.each 0..n-1, fn (i) ->
-        send_func.([id: i] ++ info |> JSEX.encode!)
+        send_func.([id: i] ++ info |> JSX.encode!)
       end
     end
   end
diff --git a/lib/httparrot/user_agent_handler.ex b/lib/httparrot/user_agent_handler.ex
index 158d92f..9f45a48 100644
--- a/lib/httparrot/user_agent_handler.ex
+++ b/lib/httparrot/user_agent_handler.ex
@@ -15,6 +15,6 @@ defmodule HTTParrot.UserAgentHandler do
 
   defp response(user_agent) do
     [{"user-agent", user_agent}]
-    |> JSEX.encode!
+    |> JSX.encode!
   end
 end
diff --git a/mix.exs b/mix.exs
index 2151a6a..394f2cd 100644
--- a/mix.exs
+++ b/mix.exs
@@ -19,14 +19,14 @@ defmodule Httparrot.Mixfile do
     [ applications: [ :compiler,
                       :syntax_tools,
                       :cowboy,
-                      :jsex ],
+                      :exjsx ],
       mod: { HTTParrot, [] },
       env: [ http_port: 8080, ssl: true, https_port: 8433 ] ]
   end
 
   defp deps do
     [ {:cowboy, "~> 1.0.0"},
-      {:jsex, "~> 2.0"},
+      {:exjsx, "~> 3.0"},
       {:meck, "~> 0.8.2", only: :test } ]
   end
 
diff --git a/mix.lock b/mix.lock
index 494f368..b8db568 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,6 +1,6 @@
-%{"cowboy": {:package, "1.0.0"},
-  "cowlib": {:package, "1.0.0"},
-  "jsex": {:package, "2.0.0"},
-  "jsx": {:package, "2.0.2"},
-  "meck": {:package, "0.8.2"},
-  "ranch": {:package, "1.0.0"}}
+%{"cowboy": {:hex, :cowboy, "1.0.0"},
+  "cowlib": {:hex, :cowlib, "1.0.0"},
+  "exjsx": {:hex, :exjsx, "3.1.0"},
+  "jsx": {:hex, :jsx, "2.4.0"},
+  "meck": {:hex, :meck, "0.8.2"},
+  "ranch": {:hex, :ranch, "1.0.0"}}
diff --git a/test/basic_auth_handler_test.exs b/test/basic_auth_handler_test.exs
index a98d42e..7ffdeec 100644
--- a/test/basic_auth_handler_test.exs
+++ b/test/basic_auth_handler_test.exs
@@ -5,7 +5,7 @@ defmodule HTTParrot.BasicAuthHandlerTest do
 
   setup do
     new :cowboy_req
-    new JSEX
+    new JSX
     on_exit fn -> unload end
     :ok
   end
@@ -18,7 +18,7 @@ defmodule HTTParrot.BasicAuthHandlerTest do
     assert is_authorized(:req1, :state) == {true, :req4, :user}
 
     assert validate :cowboy_req
-    assert validate JSEX
+    assert validate JSX
   end
 
   test "is_authorized returns false if user and passwd doesnt match" do
@@ -29,14 +29,14 @@ defmodule HTTParrot.BasicAuthHandlerTest do
     assert is_authorized(:req1, :state) == {{false, "Basic realm=\"Fake Realm\""}, :req4, :state}
 
     assert validate :cowboy_req
-    assert validate JSEX
+    assert validate JSX
   end
 
   test "returns user and if it's authenticated" do
-    expect(JSEX, :encode!, [{[[authenticated: true, user: :user]], :json}])
+    expect(JSX, :encode!, [{[[authenticated: true, user: :user]], :json}])
 
     assert get_json(:req1, :user) == {:json, :req1, nil}
 
-    assert validate JSEX
+    assert validate JSX
   end
 end
diff --git a/test/cache_handler_test.exs b/test/cache_handler_test.exs
index d939dc7..6eee486 100644
--- a/test/cache_handler_test.exs
+++ b/test/cache_handler_test.exs
@@ -5,18 +5,18 @@ defmodule HTTParrot.CacheHandlerTest do
 
   setup do
     new HTTParrot.GeneralRequestInfo
-    new JSEX
+    new JSX
     on_exit fn -> unload end
     :ok
   end
 
   test "returns prettified json with query values, headers, url and origin" do
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {:info, :req2})
-    expect(JSEX, :encode!, [{[:info], :json}])
+    expect(JSX, :encode!, [{[:info], :json}])
 
     assert get_json(:req1, :state) == {:json, :req2, :state}
 
     assert validate HTTParrot.GeneralRequestInfo
-    assert validate JSEX
+    assert validate JSX
   end
 end
diff --git a/test/cookies_handler_test.exs b/test/cookies_handler_test.exs
index c61a52c..d71c11d 100644
--- a/test/cookies_handler_test.exs
+++ b/test/cookies_handler_test.exs
@@ -5,18 +5,18 @@ defmodule HTTParrot.CookiesHandlerTest do
 
   setup do
     new :cowboy_req
-    new JSEX
+    new JSX
     on_exit fn -> unload end
     :ok
   end
 
   test "returns a JSON with all the cookies o/" do
     expect(:cowboy_req, :cookies, 1, {[k1: :v1], :req2})
-    expect(JSEX, :encode!, [{[[cookies: [k1: :v1]]], :json}])
+    expect(JSX, :encode!, [{[[cookies: [k1: :v1]]], :json}])
 
     assert get_json(:req1, :state) == {:json, :req2, :state}
 
     assert validate :cowboy_req
-    assert validate JSEX
+    assert validate JSX
   end
 end
diff --git a/test/delayed_handler_test.exs b/test/delayed_handler_test.exs
index b58f931..4022eb4 100644
--- a/test/delayed_handler_test.exs
+++ b/test/delayed_handler_test.exs
@@ -5,7 +5,7 @@ defmodule HTTParrot.DelayedHandlerTest do
 
   setup do
     new HTTParrot.GeneralRequestInfo
-    new JSEX
+    new JSX
     new :cowboy_req
     on_exit fn -> unload end
     :ok
@@ -45,11 +45,11 @@ defmodule HTTParrot.DelayedHandlerTest do
 
   test "returns json with query values, headers, url and origin" do
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {:info, :req2})
-    expect(JSEX, :encode!, [{[:info], :json}])
+    expect(JSX, :encode!, [{[:info], :json}])
 
     assert get_json(:req1, 0) == {:json, :req2, 0}
 
     assert validate HTTParrot.GeneralRequestInfo
-    assert validate JSEX
+    assert validate JSX
   end
 end
diff --git a/test/delete_handler_test.exs b/test/delete_handler_test.exs
index c409a44..f8a757a 100644
--- a/test/delete_handler_test.exs
+++ b/test/delete_handler_test.exs
@@ -6,20 +6,20 @@ defmodule HTTParrot.DeleteHandlerTest do
   setup do
     new :cowboy_req
     new HTTParrot.GeneralRequestInfo
-    new JSEX
+    new JSX
     on_exit fn -> unload end
     :ok
   end
 
   test "returns prettified json with query values, headers, url and origin" do
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {:info, :req2})
-    expect(JSEX, :encode!, [{[:info], :json}])
+    expect(JSX, :encode!, [{[:info], :json}])
     expect(:cowboy_req, :set_resp_body, [{[:json, :req2], :req3}])
 
     assert delete_resource(:req1, :state) == {true, :req3, :state}
 
     assert validate :cowboy_req
     assert validate HTTParrot.GeneralRequestInfo
-    assert validate JSEX
+    assert validate JSX
   end
 end
diff --git a/test/get_handler_test.exs b/test/get_handler_test.exs
index 65a5d8a..e96eb16 100644
--- a/test/get_handler_test.exs
+++ b/test/get_handler_test.exs
@@ -5,18 +5,18 @@ defmodule HTTParrot.GetHandlerTest do
 
   setup do
     new HTTParrot.GeneralRequestInfo
-    new JSEX
+    new JSX
     on_exit fn -> unload end
     :ok
   end
 
   test "returns prettified json with query values, headers, url and origin" do
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {:info, :req2})
-    expect(JSEX, :encode!, [{[:info], :json}])
+    expect(JSX, :encode!, [{[:info], :json}])
 
     assert get_json(:req1, :state) == {:json, :req2, :state}
 
     assert validate HTTParrot.GeneralRequestInfo
-    assert validate JSEX
+    assert validate JSX
   end
 end
diff --git a/test/gzip_handler_test.exs b/test/gzip_handler_test.exs
index 6966526..d42889c 100644
--- a/test/gzip_handler_test.exs
+++ b/test/gzip_handler_test.exs
@@ -5,15 +5,15 @@ defmodule HTTParrot.GzipHandlerTest do
 
   setup do
     new HTTParrot.GeneralRequestInfo
-    new JSEX
+    new JSX
     on_exit fn -> unload end
     :ok
   end
 
   test "returns prettified json with query values, headers, url and origin" do
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {:info, :req2})
-    expect(JSEX, :encode!, [{[:info], :json}])
-    expect(JSEX, :prettify!, [{[:json], "json"}])
+    expect(JSX, :encode!, [{[:info], :json}])
+    expect(JSX, :prettify!, [{[:json], "json"}])
     expect(:cowboy_req, :set_resp_header, 3, :req3)
 
     body = :zlib.gzip("json")
@@ -21,7 +21,7 @@ defmodule HTTParrot.GzipHandlerTest do
     assert get_json(:req1, :state) == {body, :req3, :state}
 
     assert validate HTTParrot.GeneralRequestInfo
-    assert validate JSEX
+    assert validate JSX
     assert validate :cowboy_req
   end
 end
diff --git a/test/headers_handler_test.exs b/test/headers_handler_test.exs
index 1c74cca..c251306 100644
--- a/test/headers_handler_test.exs
+++ b/test/headers_handler_test.exs
@@ -5,18 +5,18 @@ defmodule HTTParrot.HeadersHandlerTest do
 
   setup do
     new :cowboy_req
-    new JSEX
+    new JSX
     on_exit fn -> unload end
     :ok
   end
 
   test "returns prettified json with headers list" do
     expect(:cowboy_req, :headers, 1, {:headers, :req2})
-    expect(JSEX, :encode!, [{[[headers: :headers]], :json}])
+    expect(JSX, :encode!, [{[[headers: :headers]], :json}])
 
     assert get_json(:req1, :state) == {:json, :req2, :state}
 
     assert validate :cowboy_req
-    assert validate JSEX
+    assert validate JSX
   end
 end
diff --git a/test/hidden_basic_auth_handler_test.exs b/test/hidden_basic_auth_handler_test.exs
index e0406fb..5d5f983 100644
--- a/test/hidden_basic_auth_handler_test.exs
+++ b/test/hidden_basic_auth_handler_test.exs
@@ -5,7 +5,7 @@ defmodule HTTParrot.HiddenBasicAuthHandlerTest do
 
   setup do
     new :cowboy_req
-    new JSEX
+    new JSX
     on_exit fn -> unload end
     :ok
   end
@@ -18,7 +18,7 @@ defmodule HTTParrot.HiddenBasicAuthHandlerTest do
     assert resource_exists(:req1, :state) == {true, :req4, :user}
 
     assert validate :cowboy_req
-    assert validate JSEX
+    assert validate JSX
   end
 
   test "resource_exists returns false if user and passwd doesnt match" do
@@ -29,14 +29,14 @@ defmodule HTTParrot.HiddenBasicAuthHandlerTest do
     assert resource_exists(:req1, :state) == {false, :req4, :state}
 
     assert validate :cowboy_req
-    assert validate JSEX
+    assert validate JSX
   end
 
   test "returns user and if it's authenticated" do
-    expect(JSEX, :encode!, [{[[authenticated: true, user: :user]], :json}])
+    expect(JSX, :encode!, [{[[authenticated: true, user: :user]], :json}])
 
     assert get_json(:req1, :user) == {:json, :req1, nil}
 
-    assert validate JSEX
+    assert validate JSX
   end
 end
diff --git a/test/ip_handler_test.exs b/test/ip_handler_test.exs
index efc1592..6486676 100644
--- a/test/ip_handler_test.exs
+++ b/test/ip_handler_test.exs
@@ -5,7 +5,7 @@ defmodule HTTParrot.IPHandlerTest do
 
   setup do
     new :cowboy_req
-    new JSEX
+    new JSX
     on_exit fn -> unload end
     :ok
   end
@@ -13,11 +13,11 @@ defmodule HTTParrot.IPHandlerTest do
   test "returns prettified json with origin" do
     ip = {127, 1, 2, 3}
     expect(:cowboy_req, :peer, 1, {{ip, :host}, :req2})
-    expect(JSEX, :encode!, [{[[origin: "127.1.2.3"]], :json}])
+    expect(JSX, :encode!, [{[[origin: "127.1.2.3"]], :json}])
 
     assert get_json(:req1, :state) == {:json, :req2, :state}
 
     assert validate :cowboy_req
-    assert validate JSEX
+    assert validate JSX
   end
 end
diff --git a/test/p_handler_test.exs b/test/p_handler_test.exs
index 7755caa..95cbd41 100644
--- a/test/p_handler_test.exs
+++ b/test/p_handler_test.exs
@@ -5,7 +5,7 @@ defmodule HTTParrot.PHandlerTest do
 
   setup do
     new HTTParrot.GeneralRequestInfo
-    new JSEX
+    new JSX
     new :cowboy_req
     on_exit fn -> unload end
     :ok
@@ -27,7 +27,7 @@ defmodule HTTParrot.PHandlerTest do
     expect(:cowboy_req, :body_qs, 1, {:ok, :body_qs, :req2})
     expect(:cowboy_req, :set_resp_body, [{[:response, :req3], :req4}])
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req3})
-    expect(JSEX, :encode!, [{[[:info, {:form, :body_qs}, {:data, ""}, {:json, nil}]], :response}])
+    expect(JSX, :encode!, [{[[:info, {:form, :body_qs}, {:data, ""}, {:json, nil}]], :response}])
 
     assert post_form(:req1, :state) == {true, :req4, nil}
 
@@ -38,9 +38,9 @@ defmodule HTTParrot.PHandlerTest do
     expect(:cowboy_req, :body, 1, {:ok, "body", :req2})
     expect(:cowboy_req, :set_resp_body, [{[:response, :req3], :req4}])
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req3})
-    expect(JSEX, :is_json?, 1, true)
-    expect(JSEX, :decode!, 1, :decoded_json)
-    expect(JSEX, :encode!, [{[[:info, {:form, [{}]}, {:data, "body"}, {:json, :decoded_json}]], :response}])
+    expect(JSX, :is_json?, 1, true)
+    expect(JSX, :decode!, 1, :decoded_json)
+    expect(JSX, :encode!, [{[[:info, {:form, [{}]}, {:data, "body"}, {:json, :decoded_json}]], :response}])
 
     assert post_binary(:req1, :state) == {true, :req4, nil}
 
@@ -51,8 +51,8 @@ defmodule HTTParrot.PHandlerTest do
     expect(:cowboy_req, :body, 1, {:ok, "body", :req2})
     expect(:cowboy_req, :set_resp_body, [{[:response, :req3], :req4}])
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req3})
-    expect(JSEX, :is_json?, 1, false)
-    expect(JSEX, :encode!, [{[[:info, {:form, [{}]}, {:data, "body"}, {:json, nil}]], :response}])
+    expect(JSX, :is_json?, 1, false)
+    expect(JSX, :encode!, [{[[:info, {:form, [{}]}, {:data, "body"}, {:json, nil}]], :response}])
 
     assert post_binary(:req1, :state) == {true, :req4, nil}
 
@@ -63,8 +63,8 @@ defmodule HTTParrot.PHandlerTest do
     expect(:cowboy_req, :body, 1, {:ok, <<0xffff :: 16>>, :req2})
     expect(:cowboy_req, :set_resp_body, [{[:response, :req3], :req4}])
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req3})
-    expect(JSEX, :is_json?, 1, false)
-    expect(JSEX, :encode!, [{[[:info, {:form, [{}]}, {:data, "data:application/octet-stream;base64,//8="}, {:json, nil}]], :response}])
+    expect(JSX, :is_json?, 1, false)
+    expect(JSX, :encode!, [{[[:info, {:form, [{}]}, {:data, "data:application/octet-stream;base64,//8="}, {:json, nil}]], :response}])
 
     assert post_binary(:req1, :state) == {true, :req4, nil}
 
@@ -85,8 +85,8 @@ defmodule HTTParrot.PHandlerTest do
 
     expect(:cowboy_req, :set_resp_body, [{[:response, :req4], :req5}])
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req4})
-    expect(JSEX, :is_json?, 1, false)
-    expect(JSEX, :encode!, [{[[:info, {:form, [{}]}, {:data, first_chunk <> second_chunk}, {:json, nil}]], :response}])
+    expect(JSX, :is_json?, 1, false)
+    expect(JSX, :encode!, [{[[:info, {:form, [{}]}, {:data, first_chunk <> second_chunk}, {:json, nil}]], :response}])
 
     assert post_binary(:req1, :state) == {true, :req5, nil}
 
@@ -107,8 +107,8 @@ defmodule HTTParrot.PHandlerTest do
 
     expect(:cowboy_req, :set_resp_body, [{[:response, :req4], :req5}])
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req4})
-    expect(JSEX, :is_json?, 1, false)
-    expect(JSEX, :encode!, [{[[:info, {:form, [{}]}, {:data, "data:application/octet-stream;base64,#{Base.encode64(first_chunk <> second_chunk)}"}, {:json, nil}]], :response}])
+    expect(JSX, :is_json?, 1, false)
+    expect(JSX, :encode!, [{[[:info, {:form, [{}]}, {:data, "data:application/octet-stream;base64,#{Base.encode64(first_chunk <> second_chunk)}"}, {:json, nil}]], :response}])
 
     assert post_binary(:req1, :state) == {true, :req5, nil}
 
@@ -131,8 +131,8 @@ defmodule HTTParrot.PHandlerTest do
       {:ok, {"multipart", "form-data", [{"boundary", "----WebKitFormBoundary8BEQxJvZANFsvRV9"}]}, :req5}}])
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req6})
 
-    expect(JSEX, :is_json?, 1, false)
-    expect(JSEX, :encode!, [{[[:info, {:form, [{"key1", "value1"}]}, {:files, [{}]}, {:data, ""}, {:json, nil}]], :response}])
+    expect(JSX, :is_json?, 1, false)
+    expect(JSX, :encode!, [{[[:info, {:form, [{"key1", "value1"}]}, {:files, [{}]}, {:data, ""}, {:json, nil}]], :response}])
 
     expect(:cowboy_req, :set_resp_body, [{[:response, :req6], :req7}])
 
@@ -164,8 +164,8 @@ defmodule HTTParrot.PHandlerTest do
       {:ok, {"multipart", "form-data", [{"boundary", "----WebKitFormBoundary8BEQxJvZANFsvRV9"}]}, :req7}}])
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req8})
 
-    expect(JSEX, :is_json?, 1, false)
-    expect(JSEX, :encode!, [{[[:info, {:form, [{"key1", "value1"}, {"key2", "value2"}]}, {:files, [{}]}, {:data, ""}, {:json, nil}]], :response}])
+    expect(JSX, :is_json?, 1, false)
+    expect(JSX, :encode!, [{[[:info, {:form, [{"key1", "value1"}, {"key2", "value2"}]}, {:files, [{}]}, {:data, ""}, {:json, nil}]], :response}])
 
     expect(:cowboy_req, :set_resp_body, [{[:response, :req8], :req9}])
 
@@ -189,8 +189,8 @@ defmodule HTTParrot.PHandlerTest do
       {:ok, {"multipart", "form-data", [{"boundary", "----WebKitFormBoundary8BEQxJvZANFsvRV9"}]}, :req5}}])
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req6})
 
-    expect(JSEX, :is_json?, 1, false)
-    expect(JSEX, :encode!, [{[[:info, {:form, [{}]}, {:files, [{"file1", "here is some cool\ntest data."}]}, {:data, ""}, {:json, nil}]], :response}])
+    expect(JSX, :is_json?, 1, false)
+    expect(JSX, :encode!, [{[[:info, {:form, [{}]}, {:files, [{"file1", "here is some cool\ntest data."}]}, {:data, ""}, {:json, nil}]], :response}])
 
     expect(:cowboy_req, :set_resp_body, [{[:response, :req6], :req7}])
 
@@ -222,8 +222,8 @@ defmodule HTTParrot.PHandlerTest do
       {:ok, {"multipart", "form-data", [{"boundary", "----WebKitFormBoundary8BEQxJvZANFsvRV9"}]}, :req7}}])
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req8})
 
-    expect(JSEX, :is_json?, 1, false)
-    expect(JSEX, :encode!, [{[[:info, {:form, [{"key1", "value1"}]}, {:files, [{"file1", "here is some cool\ntest data"}]}, {:data, ""}, {:json, nil}]], :response}])
+    expect(JSX, :is_json?, 1, false)
+    expect(JSX, :encode!, [{[[:info, {:form, [{"key1", "value1"}]}, {:files, [{"file1", "here is some cool\ntest data"}]}, {:data, ""}, {:json, nil}]], :response}])
 
     expect(:cowboy_req, :set_resp_body, [{[:response, :req8], :req9}])
 
diff --git a/test/stream_handler_test.exs b/test/stream_handler_test.exs
index ce2ff5b..f361ae7 100644
--- a/test/stream_handler_test.exs
+++ b/test/stream_handler_test.exs
@@ -6,7 +6,7 @@ defmodule HTTParrot.StreamHandlerTest do
   setup do
     new :cowboy_req
     new HTTParrot.GeneralRequestInfo
-    new JSEX
+    new JSX
     on_exit fn -> unload end
     :ok
   end
@@ -45,7 +45,7 @@ defmodule HTTParrot.StreamHandlerTest do
 
   test "response must stream chunks" do
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req2})
-    expect(JSEX, :encode!, [{[[{:id, 0}, :info]], :json1},
+    expect(JSX, :encode!, [{[[{:id, 0}, :info]], :json1},
                             {[[{:id, 1}, :info]], :json2}])
 
     assert {{:chunked, func}, :req2, nil} = get_json(:req1, 2)
@@ -58,6 +58,6 @@ defmodule HTTParrot.StreamHandlerTest do
     assert_receive {:chunk, :json2}
 
     assert validate HTTParrot.GeneralRequestInfo
-    assert validate JSEX
+    assert validate JSX
   end
 end
diff --git a/test/user_agent_test.exs b/test/user_agent_test.exs
index cf436f1..6f56911 100644
--- a/test/user_agent_test.exs
+++ b/test/user_agent_test.exs
@@ -5,18 +5,18 @@ defmodule HTTParrot.UserAgentHandlerTest do
 
   setup do
     new :cowboy_req
-    new JSEX
+    new JSX
     on_exit fn -> unload end
     :ok
   end
 
   test "returns prettified json with user agent" do
     expect(:cowboy_req, :header, [{["user-agent", :req1, "null"], {:user_agent, :req2}}])
-    expect(JSEX, :encode!, [{[[{"user-agent", :user_agent}]], :json}])
+    expect(JSX, :encode!, [{[[{"user-agent", :user_agent}]], :json}])
 
     assert get_json(:req1, :state) == {:json, :req2, :state}
 
     assert validate :cowboy_req
-    assert validate JSEX
+    assert validate JSX
   end
 end