From 3b82af152b7e795cfe2d809b6e2af486f73514d2 Mon Sep 17 00:00:00 2001
From: Maksimenko Vladimir <xupypr@xupypr.com>
Date: Sat, 18 Jun 2016 13:53:55 +0300
Subject: [PATCH 1/5] rename abbreviation

---
 pom.xml                                       | 36 -------------------
 .../src/main/java/org/takes/it/fm/App.java    |  8 ++---
 .../src/main/java/org/takes/it/fm/RsPage.java |  4 +--
 .../auth/codecs/{CcAES.java => CcAes.java}    | 16 ++++-----
 .../auth/codecs/{CcXOR.java => CcXor.java}    |  6 ++--
 .../org/takes/http/{FtCLI.java => FtCli.java} | 10 +++---
 src/main/java/org/takes/misc/Href.java        |  6 ++--
 .../java/org/takes/rq/ChunkedInputStream.java |  4 +--
 src/main/java/org/takes/rs/Body.java          |  4 +--
 .../org/takes/rs/{RsHTML.java => RsHtml.java} | 22 ++++++------
 .../org/takes/rs/{RsJSON.java => RsJson.java} | 20 +++++------
 .../{RsPrettyJSON.java => RsPrettyJson.java}  |  6 ++--
 .../rs/{RsPrettyXML.java => RsPrettyXml.java} | 24 +++++++------
 src/main/java/org/takes/rs/RsWithBody.java    |  2 +-
 src/main/java/org/takes/rs/RsWithType.java    | 24 ++++++-------
 .../org/takes/rs/{RsXSLT.java => RsXslt.java} | 20 +++++------
 .../takes/rs/xe/{XeSLA.java => XeSla.java}    |  6 ++--
 .../org/takes/tk/{TkCORS.java => TkCors.java} |  4 +--
 .../org/takes/tk/{TkHTML.java => TkHtml.java} | 22 ++++++------
 .../codecs/{CcAESTest.java => CcAesTest.java} |  6 ++--
 .../codecs/{CcXORTest.java => CcXorTest.java} |  6 ++--
 .../facets/auth/social/PsGithubTest.java      |  4 +--
 .../facets/auth/social/PsGoogleTest.java      | 12 +++----
 .../facets/auth/social/PsLinkedinTest.java    |  6 ++--
 .../org/takes/facets/fork/TkConsumesTest.java |  6 ++--
 .../org/takes/facets/fork/TkProducesTest.java |  4 +--
 .../takes/facets/hamcrest/HmRsStatusTest.java |  8 ++---
 .../java/org/takes/http/BkTimeableTest.java   |  2 +-
 src/test/java/org/takes/http/FtBasicTest.java |  6 ++--
 .../http/{FtCLITest.java => FtCliTest.java}   |  6 ++--
 .../java/org/takes/http/MainRemoteTest.java   |  4 +--
 src/test/java/org/takes/misc/HrefTest.java    |  2 +-
 src/test/java/org/takes/rq/RqMethodTest.java  |  2 +-
 src/test/java/org/takes/rs/BodyTest.java      |  8 ++---
 .../rs/{RsJSONTest.java => RsJsonTest.java}   |  8 ++---
 ...ttyJSONTest.java => RsPrettyJsonTest.java} | 12 +++----
 ...rettyXMLTest.java => RsPrettyXmlTest.java} | 18 +++++-----
 .../java/org/takes/rs/RsWithTypeTest.java     | 12 +++----
 .../rs/{RsXSLTTest.java => RsXsltTest.java}   | 16 ++++-----
 .../rs/xe/{XeSLATest.java => XeSlaTest.java}  |  6 ++--
 .../tk/{TkCORSTest.java => TkCorsTest.java}   | 10 +++---
 .../tk/{TkHTMLTest.java => TkHtmlTest.java}   |  8 ++---
 .../java/org/takes/tk/TkRedirectTest.java     |  4 +--
 43 files changed, 193 insertions(+), 227 deletions(-)
 rename src/main/java/org/takes/facets/auth/codecs/{CcAES.java => CcAes.java} (93%)
 rename src/main/java/org/takes/facets/auth/codecs/{CcXOR.java => CcXor.java} (95%)
 rename src/main/java/org/takes/http/{FtCLI.java => FtCli.java} (95%)
 rename src/main/java/org/takes/rs/{RsHTML.java => RsHtml.java} (85%)
 rename src/main/java/org/takes/rs/{RsJSON.java => RsJson.java} (84%)
 rename src/main/java/org/takes/rs/{RsPrettyJSON.java => RsPrettyJson.java} (96%)
 rename src/main/java/org/takes/rs/{RsPrettyXML.java => RsPrettyXml.java} (91%)
 rename src/main/java/org/takes/rs/{RsXSLT.java => RsXslt.java} (94%)
 rename src/main/java/org/takes/rs/xe/{XeSLA.java => XeSla.java} (96%)
 rename src/main/java/org/takes/tk/{TkCORS.java => TkCors.java} (97%)
 rename src/main/java/org/takes/tk/{TkHTML.java => TkHtml.java} (85%)
 rename src/test/java/org/takes/facets/auth/codecs/{CcAESTest.java => CcAesTest.java} (96%)
 rename src/test/java/org/takes/facets/auth/codecs/{CcXORTest.java => CcXorTest.java} (95%)
 rename src/test/java/org/takes/http/{FtCLITest.java => FtCliTest.java} (97%)
 rename src/test/java/org/takes/rs/{RsJSONTest.java => RsJsonTest.java} (94%)
 rename src/test/java/org/takes/rs/{RsPrettyJSONTest.java => RsPrettyJsonTest.java} (92%)
 rename src/test/java/org/takes/rs/{RsPrettyXMLTest.java => RsPrettyXmlTest.java} (94%)
 rename src/test/java/org/takes/rs/{RsXSLTTest.java => RsXsltTest.java} (97%)
 rename src/test/java/org/takes/rs/xe/{XeSLATest.java => XeSlaTest.java} (95%)
 rename src/test/java/org/takes/tk/{TkCORSTest.java => TkCorsTest.java} (96%)
 rename src/test/java/org/takes/tk/{TkHTMLTest.java => TkHtmlTest.java} (93%)

diff --git a/pom.xml b/pom.xml
index f63bf7a48..08e28cd4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -341,42 +341,6 @@
                             <excludes combine.children="append">
                                 <exclude>checkstyle:/src/site/resources/.*</exclude>
                                 <!--
-                                @todo #678:30min After upgrade to qulice 0.16.4 we have to fix 
-                                 AbbreviationAsWordInNameCheck checkstyle warings in next classes. 
-                                 Fix issues and remove all excludes of PMD here.
-                                -->
-                                <exclude>checkstyle:/src/main/java/org/takes/facets/auth/codecs/CcAES.java</exclude>
-                                <exclude>checkstyle:/src/main/java/org/takes/facets/auth/codecs/CcXOR.java</exclude>
-                                <exclude>checkstyle:/src/main/java/org/takes/misc/Href.java</exclude>
-                                <exclude>checkstyle:/src/main/java/org/takes/rs/xe/XeSLA.java</exclude>
-                                <exclude>checkstyle:/src/main/java/org/takes/rs/RsJSON.java</exclude>
-                                <exclude>checkstyle:/src/main/java/org/takes/rs/RsPrettyJSON.java</exclude>
-                                <exclude>checkstyle:/src/main/java/org/takes/rs/RsWithType.java</exclude>
-                                <exclude>checkstyle:/src/main/java/org/takes/rs/RsXSLT.java</exclude>
-                                <exclude>checkstyle:/src/main/java/org/takes/rs/RsHTML.java</exclude>
-                                <exclude>checkstyle:/src/main/java/org/takes/rs/Body.java</exclude>
-                                <exclude>checkstyle:/src/main/java/org/takes/rs/RsPrettyXML.java</exclude>
-                                <exclude>checkstyle:/src/main/java/org/takes/tk/TkHTML.java</exclude>
-                                <exclude>checkstyle:/src/main/java/org/takes/tk/TkCORS.java</exclude>
-                                <exclude>checkstyle:/src/main/java/org/takes/rq/ChunkedInputStream.java</exclude>
-                                <exclude>checkstyle:/src/main/java/org/takes/http/FtCLI.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/facets/hamcrest/HmRsStatusTest.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/facets/auth/codecs/CcAESTest.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/facets/auth/codecs/CcXORTest.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/misc/HrefTest.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/rs/xe/XeSLATest.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/rs/BodyTest.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/rs/RsXSLTTest.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/rs/RsJSONTest.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/rs/RsPrettyJSONTest.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/rs/RsPrettyXMLTest.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/tk/TkHTMLTest.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/tk/TkRedirectTest.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/tk/TkCORSTest.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/rq/RqMethodTest.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/http/FtBasicTest.java</exclude>
-                                <exclude>checkstyle:/src/test/java/org/takes/http/FtCLITest.java</exclude>
-                                <!--
                                 @todo #678:30min After upgrade to qulice 0.16.4 we have to fix 
                                  AvoidDuplicateLiterals PMD warings in next classes. Fix issues and  
                                  remove all excludes of PMD here.
diff --git a/src/it/file-manager/src/main/java/org/takes/it/fm/App.java b/src/it/file-manager/src/main/java/org/takes/it/fm/App.java
index e41a77ae8..e282e2709 100644
--- a/src/it/file-manager/src/main/java/org/takes/it/fm/App.java
+++ b/src/it/file-manager/src/main/java/org/takes/it/fm/App.java
@@ -31,8 +31,8 @@
 import org.takes.facets.fork.FkRegex;
 import org.takes.facets.fork.TkFork;
 import org.takes.http.Exit;
-import org.takes.http.FtCLI;
-import org.takes.tk.TkHTML;
+import org.takes.http.FtCli;
+import org.takes.tk.TkHtml;
 import org.takes.tk.TkRedirect;
 
 /**
@@ -64,7 +64,7 @@ public App(final File dir) {
      * @throws IOException If fails
      */
     public static void main(final String... args) throws IOException {
-        new FtCLI(
+        new FtCli(
             new App(new File(System.getProperty("user.dir"))),
             args
         ).start(Exit.NEVER);
@@ -76,7 +76,7 @@ public Response act(final Request request) throws IOException {
             new FkRegex("/", new TkRedirect("/f")),
             new FkRegex(
                 "/about",
-                new TkHTML(App.class.getResource("about.html"))
+                new TkHtml(App.class.getResource("about.html"))
             ),
             new FkRegex("/robots.txt", ""),
             new FkRegex("/f(.*)", new TkDir(this.home))
diff --git a/src/it/file-manager/src/main/java/org/takes/it/fm/RsPage.java b/src/it/file-manager/src/main/java/org/takes/it/fm/RsPage.java
index 67adbdbd8..3ac75cb14 100644
--- a/src/it/file-manager/src/main/java/org/takes/it/fm/RsPage.java
+++ b/src/it/file-manager/src/main/java/org/takes/it/fm/RsPage.java
@@ -26,7 +26,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import org.takes.Response;
-import org.takes.rs.RsXSLT;
+import org.takes.rs.RsXslt;
 import org.takes.rs.xe.RsXembly;
 import org.takes.rs.xe.XeAppend;
 import org.takes.rs.xe.XeMillis;
@@ -53,7 +53,7 @@ final class RsPage implements Response {
      * @param source Xembly source
      */
     RsPage(final String xsl, final XeSource source) {
-        this.origin = new RsXSLT(
+        this.origin = new RsXslt(
             new RsXembly(
                 new XeStylesheet(xsl),
                 new XeAppend(
diff --git a/src/main/java/org/takes/facets/auth/codecs/CcAES.java b/src/main/java/org/takes/facets/auth/codecs/CcAes.java
similarity index 93%
rename from src/main/java/org/takes/facets/auth/codecs/CcAES.java
rename to src/main/java/org/takes/facets/auth/codecs/CcAes.java
index 66a47961b..ebfb69ae1 100644
--- a/src/main/java/org/takes/facets/auth/codecs/CcAES.java
+++ b/src/main/java/org/takes/facets/auth/codecs/CcAes.java
@@ -48,7 +48,7 @@
  * @since 0.13.8
  */
 @EqualsAndHashCode(of = {"origin", "key", "spec"})
-public final class CcAES implements Codec {
+public final class CcAes implements Codec {
     /**
      * The block size constant.
      */
@@ -76,7 +76,7 @@ public final class CcAES implements Codec {
      * @param key The encryption key
      * @since 0.22
      */
-    public CcAES(final Codec codec, final String key) {
+    public CcAes(final Codec codec, final String key) {
         this(codec, key.getBytes(Charset.defaultCharset()));
     }
 
@@ -86,10 +86,10 @@ public CcAES(final Codec codec, final String key) {
      * @param codec Original codec
      * @param key The encryption key
      */
-    public CcAES(final Codec codec, final byte[] key) {
+    public CcAes(final Codec codec, final byte[] key) {
         this.origin = codec;
         this.key = key.clone();
-        this.spec = CcAES.algorithmParameterSpec();
+        this.spec = CcAes.algorithmParameterSpec();
     }
 
     @Override
@@ -126,7 +126,7 @@ private byte[] encrypt(final byte[] bytes) throws IOException {
      */
     private static AlgorithmParameterSpec algorithmParameterSpec() {
         final SecureRandom random = new SecureRandom();
-        final byte[] bytes = new byte[CcAES.BLOCK];
+        final byte[] bytes = new byte[CcAes.BLOCK];
         random.nextBytes(bytes);
         return new IvParameterSpec(bytes);
     }
@@ -138,11 +138,11 @@ private static AlgorithmParameterSpec algorithmParameterSpec() {
      * @return The verified encryption key
      */
     private static byte[] withCorrectBlockSize(final byte[] key) {
-        if (key.length != CcAES.BLOCK) {
+        if (key.length != CcAes.BLOCK) {
             throw new IllegalArgumentException(
                 String.format(
                     "the length of the AES key must be exactly %d bytes",
-                    CcAES.BLOCK
+                    CcAes.BLOCK
                 )
             );
         }
@@ -177,7 +177,7 @@ private Cipher create(final int mode)
         throws IOException {
         try {
             final SecretKeySpec secret = new SecretKeySpec(
-                CcAES.withCorrectBlockSize(this.key), "AES"
+                CcAes.withCorrectBlockSize(this.key), "AES"
             );
             final Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
             cipher.init(mode, secret, this.spec);
diff --git a/src/main/java/org/takes/facets/auth/codecs/CcXOR.java b/src/main/java/org/takes/facets/auth/codecs/CcXor.java
similarity index 95%
rename from src/main/java/org/takes/facets/auth/codecs/CcXOR.java
rename to src/main/java/org/takes/facets/auth/codecs/CcXor.java
index 25410323b..9ee419e35 100644
--- a/src/main/java/org/takes/facets/auth/codecs/CcXOR.java
+++ b/src/main/java/org/takes/facets/auth/codecs/CcXor.java
@@ -39,7 +39,7 @@
  * @since 0.1
  */
 @EqualsAndHashCode(of = { "origin", "secret" })
-public final class CcXOR implements Codec {
+public final class CcXor implements Codec {
 
     /**
      * Original codec.
@@ -56,7 +56,7 @@ public final class CcXOR implements Codec {
      * @param codec Original codec
      * @param key Secret key for encoding
      */
-    public CcXOR(final Codec codec, final String key) {
+    public CcXor(final Codec codec, final String key) {
         this(codec, new Utf8String(key).bytes());
     }
 
@@ -65,7 +65,7 @@ public CcXOR(final Codec codec, final String key) {
      * @param codec Original codec
      * @param key Secret key for encoding
      */
-    public CcXOR(final Codec codec, final byte[] key) {
+    public CcXor(final Codec codec, final byte[] key) {
         this.origin = codec;
         this.secret = Arrays.copyOf(key, key.length);
     }
diff --git a/src/main/java/org/takes/http/FtCLI.java b/src/main/java/org/takes/http/FtCli.java
similarity index 95%
rename from src/main/java/org/takes/http/FtCLI.java
rename to src/main/java/org/takes/http/FtCli.java
index a0c568293..fea6867d7 100644
--- a/src/main/java/org/takes/http/FtCLI.java
+++ b/src/main/java/org/takes/http/FtCli.java
@@ -58,7 +58,7 @@
  * @since 0.1
  */
 @EqualsAndHashCode(of = { "take", "options" })
-public final class FtCLI implements Front {
+public final class FtCli implements Front {
 
     /**
      * Take.
@@ -75,7 +75,7 @@ public final class FtCLI implements Front {
      * @param tks Take
      * @param args Arguments
      */
-    public FtCLI(final Take tks, final String... args) {
+    public FtCli(final Take tks, final String... args) {
         this(tks, Arrays.asList(args));
     }
 
@@ -84,7 +84,7 @@ public FtCLI(final Take tks, final String... args) {
      * @param tks Take
      * @param args Arguments
      */
-    public FtCLI(final Take tks, final Iterable<String> args) {
+    public FtCli(final Take tks, final Iterable<String> args) {
         this.take = tks;
         this.options = new Options(args);
     }
@@ -96,7 +96,7 @@ public void start(final Exit exit) throws IOException {
             tks = new Take() {
                 @Override
                 public Response act(final Request request) throws IOException {
-                    return FtCLI.this.take.act(
+                    return FtCli.this.take.act(
                         new RqWithHeader(
                             request, "X-Takes-HitRefresh: yes"
                         )
@@ -125,7 +125,7 @@ public Response act(final Request request) throws IOException {
                     @Override
                     public void run() {
                         try {
-                            front.start(FtCLI.this.exit(exit));
+                            front.start(FtCli.this.exit(exit));
                         } catch (final IOException ex) {
                             throw new IllegalStateException(ex);
                         }
diff --git a/src/main/java/org/takes/misc/Href.java b/src/main/java/org/takes/misc/Href.java
index 3f2942b56..758ab5a73 100644
--- a/src/main/java/org/takes/misc/Href.java
+++ b/src/main/java/org/takes/misc/Href.java
@@ -81,7 +81,7 @@ public Href() {
      * @param txt Text of the link
      */
     public Href(final CharSequence txt) {
-        this(Href.createURI(txt.toString()));
+        this(Href.createUri(txt.toString()));
     }
 
     /**
@@ -282,7 +282,7 @@ private static String decode(final String txt) {
      * @throws IllegalStateException in case an invalid character could not be
      *  encoded properly.
      */
-    private static URI createURI(final String txt) {
+    private static URI createUri(final String txt) {
         URI result;
         try {
             result = new URI(txt);
@@ -297,7 +297,7 @@ private static URI createURI(final String txt) {
                 index + 1,
                 Href.encode(value.substring(index, index + 1))
             );
-            result = Href.createURI(value.toString());
+            result = Href.createUri(value.toString());
         }
         return result;
     }
diff --git a/src/main/java/org/takes/rq/ChunkedInputStream.java b/src/main/java/org/takes/rq/ChunkedInputStream.java
index fb4c49f67..1a3fb766b 100644
--- a/src/main/java/org/takes/rq/ChunkedInputStream.java
+++ b/src/main/java/org/takes/rq/ChunkedInputStream.java
@@ -120,7 +120,7 @@ public int read(final byte[] buf) throws IOException {
      * Read the CRLF terminator.
      * @throws IOException If an IO error occurs.
      */
-    private void readCRLF() throws IOException {
+    private void readCrlf() throws IOException {
         final int crsymbol = this.origin.read();
         final int lfsymbol = this.origin.read();
         if (crsymbol != '\r' || lfsymbol != '\n') {
@@ -142,7 +142,7 @@ private void readCRLF() throws IOException {
      */
     private void nextChunk() throws IOException {
         if (!this.bof) {
-            this.readCRLF();
+            this.readCrlf();
         }
         this.size = ChunkedInputStream.chunkSize(this.origin);
         this.bof = false;
diff --git a/src/main/java/org/takes/rs/Body.java b/src/main/java/org/takes/rs/Body.java
index 8572c45c5..5104aeb07 100644
--- a/src/main/java/org/takes/rs/Body.java
+++ b/src/main/java/org/takes/rs/Body.java
@@ -63,7 +63,7 @@ interface Body {
     /**
      * Content of a body based on an {@link java.net.URL}.
      */
-    final class URL implements Body {
+    final class Url implements Body {
 
         /**
          * The {@link java.net.URL} of the content.
@@ -74,7 +74,7 @@ final class URL implements Body {
          * Constructs an {@code URL} with the specified {@link java.net.URL}.
          * @param content The {@link java.net.URL} of the content.
          */
-        URL(final java.net.URL content) {
+        Url(final java.net.URL content) {
             this.url = content;
         }
 
diff --git a/src/main/java/org/takes/rs/RsHTML.java b/src/main/java/org/takes/rs/RsHtml.java
similarity index 85%
rename from src/main/java/org/takes/rs/RsHTML.java
rename to src/main/java/org/takes/rs/RsHtml.java
index b82efc666..c00eac3a5 100644
--- a/src/main/java/org/takes/rs/RsHTML.java
+++ b/src/main/java/org/takes/rs/RsHtml.java
@@ -41,13 +41,13 @@
  */
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-public final class RsHTML extends RsWrap {
+public final class RsHtml extends RsWrap {
 
     /**
      * Ctor.
      * @since 0.10
      */
-    public RsHTML() {
+    public RsHtml() {
         this("<html/>");
     }
 
@@ -55,7 +55,7 @@ public RsHTML() {
      * Ctor.
      * @param body HTML body
      */
-    public RsHTML(final CharSequence body) {
+    public RsHtml(final CharSequence body) {
         this(new RsEmpty(), body);
     }
 
@@ -63,7 +63,7 @@ public RsHTML(final CharSequence body) {
      * Ctor.
      * @param body HTML body
      */
-    public RsHTML(final byte[] body) {
+    public RsHtml(final byte[] body) {
         this(new RsEmpty(), body);
     }
 
@@ -72,7 +72,7 @@ public RsHTML(final byte[] body) {
      * @param url URL with body
      * @since 0.10
      */
-    public RsHTML(final URL url) {
+    public RsHtml(final URL url) {
         this(new RsEmpty(), url);
     }
 
@@ -80,7 +80,7 @@ public RsHTML(final URL url) {
      * Ctor.
      * @param body HTML body
      */
-    public RsHTML(final InputStream body) {
+    public RsHtml(final InputStream body) {
         this(new RsEmpty(), body);
     }
 
@@ -89,7 +89,7 @@ public RsHTML(final InputStream body) {
      * @param res Original response
      * @param body HTML body
      */
-    public RsHTML(final Response res, final CharSequence body) {
+    public RsHtml(final Response res, final CharSequence body) {
         this(new RsWithBody(res, body));
     }
 
@@ -98,7 +98,7 @@ public RsHTML(final Response res, final CharSequence body) {
      * @param res Original response
      * @param body HTML body
      */
-    public RsHTML(final Response res, final byte[] body) {
+    public RsHtml(final Response res, final byte[] body) {
         this(new RsWithBody(res, body));
     }
 
@@ -107,7 +107,7 @@ public RsHTML(final Response res, final byte[] body) {
      * @param res Original response
      * @param body HTML body
      */
-    public RsHTML(final Response res, final InputStream body) {
+    public RsHtml(final Response res, final InputStream body) {
         this(new RsWithBody(res, new Body.TempFile(new Body.Stream(body))));
     }
 
@@ -116,7 +116,7 @@ public RsHTML(final Response res, final InputStream body) {
      * @param res Original response
      * @param url URL with body
      */
-    public RsHTML(final Response res, final URL url) {
+    public RsHtml(final Response res, final URL url) {
         this(new RsWithBody(res, url));
     }
 
@@ -125,7 +125,7 @@ public RsHTML(final Response res, final URL url) {
      * @param res Original response
      * @since 0.10
      */
-    public RsHTML(final Response res) {
+    public RsHtml(final Response res) {
         super(
             new RsWithType(
                 new RsWithStatus(res, HttpURLConnection.HTTP_OK),
diff --git a/src/main/java/org/takes/rs/RsJSON.java b/src/main/java/org/takes/rs/RsJson.java
similarity index 84%
rename from src/main/java/org/takes/rs/RsJSON.java
rename to src/main/java/org/takes/rs/RsJson.java
index d8c8fc892..41cd7287d 100644
--- a/src/main/java/org/takes/rs/RsJSON.java
+++ b/src/main/java/org/takes/rs/RsJson.java
@@ -44,18 +44,18 @@
  */
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-public final class RsJSON extends RsWrap {
+public final class RsJson extends RsWrap {
 
     /**
      * Ctor.
      * @param json JSON object
      * @throws IOException If fails
      */
-    public RsJSON(final JsonStructure json) throws IOException {
+    public RsJson(final JsonStructure json) throws IOException {
         this(
-            new RsJSON.Source() {
+            new RsJson.Source() {
                 @Override
-                public JsonStructure toJSON() {
+                public JsonStructure toJson() {
                     return json;
                 }
             }
@@ -67,15 +67,15 @@ public JsonStructure toJSON() {
      * @param src Source
      * @throws IOException If fails
      */
-    public RsJSON(final RsJSON.Source src) throws IOException {
-        this(new RsWithBody(RsJSON.print(src)));
+    public RsJson(final RsJson.Source src) throws IOException {
+        this(new RsWithBody(RsJson.print(src)));
     }
 
     /**
      * Ctor.
      * @param res Resource
      */
-    public RsJSON(final Response res) {
+    public RsJson(final Response res) {
         super(
             new RsWithType(
                 new RsWithStatus(res, HttpURLConnection.HTTP_OK),
@@ -90,11 +90,11 @@ public RsJSON(final Response res) {
      * @return JSON
      * @throws IOException If fails
      */
-    private static byte[] print(final RsJSON.Source src) throws IOException {
+    private static byte[] print(final RsJson.Source src) throws IOException {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
         final JsonWriter writer = Json.createWriter(baos);
         try {
-            writer.write(src.toJSON());
+            writer.write(src.toJson());
         } finally {
             writer.close();
         }
@@ -110,7 +110,7 @@ public interface Source {
          * @return JSON
          * @throws IOException If fails
          */
-        JsonStructure toJSON() throws IOException;
+        JsonStructure toJson() throws IOException;
     }
 
 }
diff --git a/src/main/java/org/takes/rs/RsPrettyJSON.java b/src/main/java/org/takes/rs/RsPrettyJson.java
similarity index 96%
rename from src/main/java/org/takes/rs/RsPrettyJSON.java
rename to src/main/java/org/takes/rs/RsPrettyJson.java
index c79d724c4..aa425cb25 100644
--- a/src/main/java/org/takes/rs/RsPrettyJSON.java
+++ b/src/main/java/org/takes/rs/RsPrettyJson.java
@@ -51,7 +51,7 @@
  */
 @ToString(of = "origin")
 @EqualsAndHashCode(of = "origin")
-public final class RsPrettyJSON implements Response {
+public final class RsPrettyJson implements Response {
 
     /**
      * Original response.
@@ -67,7 +67,7 @@ public final class RsPrettyJSON implements Response {
      * Ctor.
      * @param res Original response
      */
-    public RsPrettyJSON(final Response res) {
+    public RsPrettyJson(final Response res) {
         this.transformed = new CopyOnWriteArrayList<Response>();
         this.origin = res;
     }
@@ -94,7 +94,7 @@ private Response make() throws IOException {
                 this.transformed.add(
                     new RsWithBody(
                         this.origin,
-                        RsPrettyJSON.transform(this.origin.body())
+                        RsPrettyJson.transform(this.origin.body())
                     )
                 );
             }
diff --git a/src/main/java/org/takes/rs/RsPrettyXML.java b/src/main/java/org/takes/rs/RsPrettyXml.java
similarity index 91%
rename from src/main/java/org/takes/rs/RsPrettyXML.java
rename to src/main/java/org/takes/rs/RsPrettyXml.java
index 4a505b0dd..d199a0256 100644
--- a/src/main/java/org/takes/rs/RsPrettyXML.java
+++ b/src/main/java/org/takes/rs/RsPrettyXml.java
@@ -57,7 +57,7 @@
  */
 @ToString(of = "origin")
 @EqualsAndHashCode(of = "origin")
-public final class RsPrettyXML implements Response {
+public final class RsPrettyXml implements Response {
 
     /**
      * Xerces feature to disable external DTD validation.
@@ -79,7 +79,7 @@ public final class RsPrettyXML implements Response {
      * Ctor.
      * @param res Original response
      */
-    public RsPrettyXML(final Response res) {
+    public RsPrettyXml(final Response res) {
         this.transformed = new CopyOnWriteArrayList<Response>();
         this.origin = res;
     }
@@ -106,7 +106,7 @@ private Response make() throws IOException {
                 this.transformed.add(
                     new RsWithBody(
                         this.origin,
-                        RsPrettyXML.transform(this.origin.body())
+                        RsPrettyXml.transform(this.origin.body())
                     )
                 );
             }
@@ -128,16 +128,17 @@ private static byte[] transform(final InputStream body) throws IOException {
                 .newSAXParser().getXMLReader();
             source.setXMLReader(xmlreader);
             xmlreader.setFeature(
-                RsPrettyXML.LOAD_EXTERNAL_DTD, false
+                RsPrettyXml.LOAD_EXTERNAL_DTD, false
             );
+            final String yes = "yes";
             final Transformer transformer = TransformerFactory.newInstance()
                 .newTransformer();
             // @checkstyle MultipleStringLiteralsCheck (2 line)
             transformer.setOutputProperty(
-                OutputKeys.OMIT_XML_DECLARATION, "yes"
+                OutputKeys.OMIT_XML_DECLARATION, yes
             );
-            RsPrettyXML.prepareDocType(body, transformer);
-            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            RsPrettyXml.prepareDocType(body, transformer);
+            transformer.setOutputProperty(OutputKeys.INDENT, yes);
             transformer.transform(source, new StreamResult(result));
         } catch (final TransformerException ex) {
             throw new IOException(ex);
@@ -159,13 +160,14 @@ private static byte[] transform(final InputStream body) throws IOException {
     private static void prepareDocType(final InputStream body,
         final Transformer transformer) throws IOException {
         try {
-            final DocumentType doctype = RsPrettyXML.getDocType(body);
+            final String html = "html";
+            final DocumentType doctype = RsPrettyXml.getDocType(body);
             if (null != doctype) {
                 if (null == doctype.getSystemId()
                     && null == doctype.getPublicId()
                     // @checkstyle MultipleStringLiteralsCheck (3 line)
-                    && "html".equalsIgnoreCase(doctype.getName())) {
-                    transformer.setOutputProperty(OutputKeys.METHOD, "html");
+                    && html.equalsIgnoreCase(doctype.getName())) {
+                    transformer.setOutputProperty(OutputKeys.METHOD, html);
                     transformer.setOutputProperty(OutputKeys.VERSION, "5.0");
                     return;
                 }
@@ -199,7 +201,7 @@ private static DocumentType getDocType(final InputStream body)
         final DocumentBuilderFactory factory =
             DocumentBuilderFactory.newInstance();
         try {
-            factory.setFeature(RsPrettyXML.LOAD_EXTERNAL_DTD, false);
+            factory.setFeature(RsPrettyXml.LOAD_EXTERNAL_DTD, false);
             final DocumentBuilder builder = factory.newDocumentBuilder();
             return builder.parse(body).getDoctype();
         } catch (final ParserConfigurationException ex) {
diff --git a/src/main/java/org/takes/rs/RsWithBody.java b/src/main/java/org/takes/rs/RsWithBody.java
index 3bb7bd6e3..b758e4259 100644
--- a/src/main/java/org/takes/rs/RsWithBody.java
+++ b/src/main/java/org/takes/rs/RsWithBody.java
@@ -113,7 +113,7 @@ public RsWithBody(final Response res, final CharSequence body,
      * @param url URL with body
      */
     public RsWithBody(final Response res, final URL url) {
-        this(res, new Body.URL(url));
+        this(res, new Body.Url(url));
     }
 
     /**
diff --git a/src/main/java/org/takes/rs/RsWithType.java b/src/main/java/org/takes/rs/RsWithType.java
index f9304f8cd..b3f969b42 100644
--- a/src/main/java/org/takes/rs/RsWithType.java
+++ b/src/main/java/org/takes/rs/RsWithType.java
@@ -134,14 +134,14 @@ private static Response make(final Response res, final CharSequence type,
      * @version $Id$
      * @since 0.30
      */
-    public static final class HTML extends RsWrap {
+    public static final class Html extends RsWrap {
 
         /**
          * Constructs a {@code HTML} that will add text/html as the content type
          * header to the response.
          * @param res Original response
          */
-        public HTML(final Response res) {
+        public Html(final Response res) {
             this(res, new Opt.Empty<Charset>());
         }
 
@@ -152,7 +152,7 @@ public HTML(final Response res) {
          * @param res Original response
          * @param charset The character set to add in the content type header
          */
-        public HTML(final Response res, final Charset charset) {
+        public Html(final Response res, final Charset charset) {
             this(res, new Opt.Single<Charset>(charset));
         }
 
@@ -164,7 +164,7 @@ public HTML(final Response res, final Charset charset) {
          * @param charset The character set to add in the content type header if
          *  present.
          */
-        private HTML(final Response res, final Opt<Charset> charset) {
+        private Html(final Response res, final Opt<Charset> charset) {
             super(RsWithType.make(res, "text/html", charset));
         }
 
@@ -179,14 +179,14 @@ private HTML(final Response res, final Opt<Charset> charset) {
      * @version $Id$
      * @since 0.30
      */
-    public static final class JSON extends RsWrap {
+    public static final class Json extends RsWrap {
 
         /**
          * Constructs a {@code JSON} that will add application/json as the
          * content type header to the response.
          * @param res Original response
          */
-        public JSON(final Response res) {
+        public Json(final Response res) {
             this(res, new Opt.Empty<Charset>());
         }
 
@@ -197,7 +197,7 @@ public JSON(final Response res) {
          * @param res Original response
          * @param charset The character set to add in the content type header
          */
-        public JSON(final Response res, final Charset charset) {
+        public Json(final Response res, final Charset charset) {
             this(res, new Opt.Single<Charset>(charset));
         }
 
@@ -209,7 +209,7 @@ public JSON(final Response res, final Charset charset) {
          * @param charset The character set to add in the content type header if
          *  present.
          */
-        private JSON(final Response res, final Opt<Charset> charset) {
+        private Json(final Response res, final Opt<Charset> charset) {
             super(RsWithType.make(res, "application/json", charset));
         }
 
@@ -224,14 +224,14 @@ private JSON(final Response res, final Opt<Charset> charset) {
      * @version $Id$
      * @since 0.30
      */
-    public static final class XML extends RsWrap {
+    public static final class Xml extends RsWrap {
 
         /**
          * Constructs a {@code XML} that will add text/xml as the content type
          * header to the response.
          * @param res Original response
          */
-        public XML(final Response res) {
+        public Xml(final Response res) {
             this(res, new Opt.Empty<Charset>());
         }
 
@@ -242,7 +242,7 @@ public XML(final Response res) {
          * @param res Original response
          * @param charset The character set to add in the content type header
          */
-        public XML(final Response res, final Charset charset) {
+        public Xml(final Response res, final Charset charset) {
             this(res, new Opt.Single<Charset>(charset));
         }
 
@@ -254,7 +254,7 @@ public XML(final Response res, final Charset charset) {
          * @param charset The character set to add in the content type header if
          *  present.
          */
-        private XML(final Response res, final Opt<Charset> charset) {
+        private Xml(final Response res, final Opt<Charset> charset) {
             super(RsWithType.make(res, "text/xml", charset));
         }
 
diff --git a/src/main/java/org/takes/rs/RsXSLT.java b/src/main/java/org/takes/rs/RsXslt.java
similarity index 94%
rename from src/main/java/org/takes/rs/RsXSLT.java
rename to src/main/java/org/takes/rs/RsXslt.java
index b86464d8d..8efdb94d1 100644
--- a/src/main/java/org/takes/rs/RsXSLT.java
+++ b/src/main/java/org/takes/rs/RsXslt.java
@@ -54,7 +54,7 @@
  * &lt;page/&gt;
  * </pre>
  *
- * <p>{@link org.takes.rs.RsXSLT} will try to find that {@code /xsl/home.xsl}
+ * <p>{@link org.takes.rs.RsXslt} will try to find that {@code /xsl/home.xsl}
  * resource in classpath. If it's not found a runtime exception will thrown.
  *
  * <p>The best way to use this decorator is in combination with
@@ -86,14 +86,14 @@
  */
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-public final class RsXSLT extends RsWrap {
+public final class RsXslt extends RsWrap {
 
     /**
      * Ctor.
      * @param rsp Original response
      */
-    public RsXSLT(final Response rsp) {
-        this(rsp, new RsXSLT.InClasspath());
+    public RsXslt(final Response rsp) {
+        this(rsp, new RsXslt.InClasspath());
     }
 
     /**
@@ -101,7 +101,7 @@ public RsXSLT(final Response rsp) {
      * @param rsp Original response
      * @param resolver URI resolver
      */
-    public RsXSLT(final Response rsp, final URIResolver resolver) {
+    public RsXslt(final Response rsp, final URIResolver resolver) {
         super(
             new Response() {
                 @Override
@@ -110,7 +110,7 @@ public Iterable<String> head() throws IOException {
                 }
                 @Override
                 public InputStream body() throws IOException {
-                    return RsXSLT.transform(rsp.body(), resolver);
+                    return RsXslt.transform(rsp.body(), resolver);
                 }
             }
         );
@@ -128,7 +128,7 @@ private static InputStream transform(final InputStream origin,
         try {
             final TransformerFactory factory = TransformerFactory.newInstance();
             factory.setURIResolver(resolver);
-            return RsXSLT.transform(factory, origin);
+            return RsXslt.transform(factory, origin);
         } catch (final TransformerException ex) {
             throw new IOException(ex);
         }
@@ -145,19 +145,19 @@ private static InputStream transform(final TransformerFactory factory,
         final InputStream xml) throws TransformerException {
         final byte[] input;
         try {
-            input = RsXSLT.consume(xml);
+            input = RsXslt.consume(xml);
         } catch (final IOException ex) {
             throw new IllegalStateException(ex);
         }
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        final Source xsl = RsXSLT.stylesheet(
+        final Source xsl = RsXslt.stylesheet(
             factory, new StreamSource(
                 new Utf8InputStreamReader(
                     new ByteArrayInputStream(new Utf8String(input).bytes())
                 )
             )
         );
-        RsXSLT.transformer(factory, xsl).transform(
+        RsXslt.transformer(factory, xsl).transform(
             new StreamSource(
                 new Utf8InputStreamReader(
                     new ByteArrayInputStream(new Utf8String(input).bytes())
diff --git a/src/main/java/org/takes/rs/xe/XeSLA.java b/src/main/java/org/takes/rs/xe/XeSla.java
similarity index 96%
rename from src/main/java/org/takes/rs/xe/XeSLA.java
rename to src/main/java/org/takes/rs/xe/XeSla.java
index bed584be3..5ab772113 100644
--- a/src/main/java/org/takes/rs/xe/XeSLA.java
+++ b/src/main/java/org/takes/rs/xe/XeSla.java
@@ -55,12 +55,12 @@
  * @since 0.3
  */
 @EqualsAndHashCode(callSuper = true)
-public final class XeSLA extends XeWrap {
+public final class XeSla extends XeWrap {
 
     /**
      * Ctor.
      */
-    public XeSLA() {
+    public XeSla() {
         this("sla");
     }
 
@@ -68,7 +68,7 @@ public XeSLA() {
      * Ctor.
      * @param attr Attribute name
      */
-    public XeSLA(final CharSequence attr) {
+    public XeSla(final CharSequence attr) {
         super(
             new XeSource() {
                 @Override
diff --git a/src/main/java/org/takes/tk/TkCORS.java b/src/main/java/org/takes/tk/TkCors.java
similarity index 97%
rename from src/main/java/org/takes/tk/TkCORS.java
rename to src/main/java/org/takes/tk/TkCors.java
index d6aa8cde2..468e32a56 100644
--- a/src/main/java/org/takes/tk/TkCORS.java
+++ b/src/main/java/org/takes/tk/TkCors.java
@@ -53,7 +53,7 @@
  */
 @ToString(of = { "origin", "allowed" })
 @EqualsAndHashCode(of = { "origin", "allowed" })
-public final class TkCORS implements Take {
+public final class TkCors implements Take {
 
     /**
      * Original take.
@@ -70,7 +70,7 @@ public final class TkCORS implements Take {
      * @param take Original
      * @param domains Allow domains
      */
-    public TkCORS(final Take take, final String... domains) {
+    public TkCors(final Take take, final String... domains) {
         this.origin = take;
         this.allowed = new HashSet<String>(Arrays.asList(domains));
     }
diff --git a/src/main/java/org/takes/tk/TkHTML.java b/src/main/java/org/takes/tk/TkHtml.java
similarity index 85%
rename from src/main/java/org/takes/tk/TkHTML.java
rename to src/main/java/org/takes/tk/TkHtml.java
index a8041f03e..85b3ae061 100644
--- a/src/main/java/org/takes/tk/TkHTML.java
+++ b/src/main/java/org/takes/tk/TkHtml.java
@@ -30,13 +30,13 @@
 import org.takes.Request;
 import org.takes.Response;
 import org.takes.Take;
-import org.takes.rs.RsHTML;
+import org.takes.rs.RsHtml;
 
 /**
  * HTML take.
  *
  * <p>This take returns an HTML response by wrapping the provided
- * content into {@link org.takes.rs.RsHTML}.
+ * content into {@link org.takes.rs.RsHtml}.
  *
  * <p>The class is immutable and thread-safe.
  *
@@ -46,18 +46,18 @@
  */
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-public final class TkHTML extends TkWrap {
+public final class TkHtml extends TkWrap {
 
     /**
      * Ctor.
      * @param body Text
      */
-    public TkHTML(final String body) {
+    public TkHtml(final String body) {
         super(
             new Take() {
                 @Override
                 public Response act(final Request req) {
-                    return new RsHTML(body);
+                    return new RsHtml(body);
                 }
             }
         );
@@ -67,12 +67,12 @@ public Response act(final Request req) {
      * Ctor.
      * @param body Body with HTML
      */
-    public TkHTML(final byte[] body) {
+    public TkHtml(final byte[] body) {
         super(
             new Take() {
                 @Override
                 public Response act(final Request req) {
-                    return new RsHTML(body);
+                    return new RsHtml(body);
                 }
             }
         );
@@ -82,12 +82,12 @@ public Response act(final Request req) {
      * Ctor.
      * @param url URL with content
      */
-    public TkHTML(final URL url) {
+    public TkHtml(final URL url) {
         super(
             new Take() {
                 @Override
                 public Response act(final Request req) {
-                    return new RsHTML(url);
+                    return new RsHtml(url);
                 }
             }
         );
@@ -97,12 +97,12 @@ public Response act(final Request req) {
      * Ctor.
      * @param body Content
      */
-    public TkHTML(final InputStream body) {
+    public TkHtml(final InputStream body) {
         super(
             new Take() {
                 @Override
                 public Response act(final Request req) {
-                    return new RsHTML(body);
+                    return new RsHtml(body);
                 }
             }
         );
diff --git a/src/test/java/org/takes/facets/auth/codecs/CcAESTest.java b/src/test/java/org/takes/facets/auth/codecs/CcAesTest.java
similarity index 96%
rename from src/test/java/org/takes/facets/auth/codecs/CcAESTest.java
rename to src/test/java/org/takes/facets/auth/codecs/CcAesTest.java
index 635708374..99cf0fda5 100644
--- a/src/test/java/org/takes/facets/auth/codecs/CcAESTest.java
+++ b/src/test/java/org/takes/facets/auth/codecs/CcAesTest.java
@@ -31,12 +31,12 @@
 import org.takes.facets.auth.Identity;
 
 /**
- * Test case for {@link CcAES}.
+ * Test case for {@link CcAes}.
  * @author Jason Wong (super132j@yahoo.com)
  * @version $Id$
  * @since 0.13.8
  */
-public final class CcAESTest {
+public final class CcAesTest {
 
     /**
      * CcAES can encode and decode.
@@ -49,7 +49,7 @@ public void encodesAndDecodes() throws Exception {
         generator.init(length);
         final byte[] key = generator.generateKey().getEncoded();
         final String plain = "This is a test!!@@**";
-        final Codec codec = new CcAES(
+        final Codec codec = new CcAes(
             new Codec() {
                 @Override
                 public Identity decode(final byte[] bytes) throws IOException {
diff --git a/src/test/java/org/takes/facets/auth/codecs/CcXORTest.java b/src/test/java/org/takes/facets/auth/codecs/CcXorTest.java
similarity index 95%
rename from src/test/java/org/takes/facets/auth/codecs/CcXORTest.java
rename to src/test/java/org/takes/facets/auth/codecs/CcXorTest.java
index e6334f408..22130c29f 100644
--- a/src/test/java/org/takes/facets/auth/codecs/CcXORTest.java
+++ b/src/test/java/org/takes/facets/auth/codecs/CcXorTest.java
@@ -31,12 +31,12 @@
 import org.takes.facets.auth.Identity;
 
 /**
- * Test case for {@link CcXOR}.
+ * Test case for {@link CcXor}.
  * @author Dmitry Zaytsev (dmitry.zaytsev@gmail.com)
  * @version $Id$
  * @since 0.13.7
  */
-public final class CcXORTest {
+public final class CcXorTest {
 
     /**
      * CcXor can encode and decode.
@@ -45,7 +45,7 @@ public final class CcXORTest {
     @Test
     public void encodesAndDecodes() throws IOException {
         final String urn = "urn:domain:9";
-        final Codec codec = new CcXOR(
+        final Codec codec = new CcXor(
             new Codec() {
                 @Override
                 public byte[] encode(final Identity identity) {
diff --git a/src/test/java/org/takes/facets/auth/social/PsGithubTest.java b/src/test/java/org/takes/facets/auth/social/PsGithubTest.java
index 0f84ae1bb..41bd12834 100644
--- a/src/test/java/org/takes/facets/auth/social/PsGithubTest.java
+++ b/src/test/java/org/takes/facets/auth/social/PsGithubTest.java
@@ -43,7 +43,7 @@
 import org.takes.rq.RqForm;
 import org.takes.rq.RqGreedy;
 import org.takes.rq.RqHref;
-import org.takes.rs.RsJSON;
+import org.takes.rs.RsJson;
 import org.takes.rs.xe.RsXembly;
 import org.takes.rs.xe.XeDirectives;
 import org.xembly.Directives;
@@ -208,7 +208,7 @@ public Response act(final Request req) throws IOException {
                     .iterator().next(),
                 Matchers.containsString(PsGithubTest.GIT_HUB_TOKEN)
             );
-            return new RsJSON(
+            return new RsJson(
                 Json.createObjectBuilder()
                     .add(PsGithubTest.LOGIN, PsGithubTest.OCTOCAT)
                     .add("id", 1)
diff --git a/src/test/java/org/takes/facets/auth/social/PsGoogleTest.java b/src/test/java/org/takes/facets/auth/social/PsGoogleTest.java
index 4f6d59a42..44c960b30 100644
--- a/src/test/java/org/takes/facets/auth/social/PsGoogleTest.java
+++ b/src/test/java/org/takes/facets/auth/social/PsGoogleTest.java
@@ -42,7 +42,7 @@
 import org.takes.rq.RqGreedy;
 import org.takes.rq.RqHref;
 import org.takes.rq.RqPrint;
-import org.takes.rs.RsJSON;
+import org.takes.rs.RsJson;
 
 /**
  * Test case for {@link PsGoogle}.
@@ -111,7 +111,7 @@ public Response act(final Request req) throws IOException {
                                 .iterator().next(),
                             Matchers.containsString(PsGoogleTest.GOOGLE_TOKEN)
                         );
-                        return new RsJSON(
+                        return new RsJson(
                             Json.createObjectBuilder()
                                 .add("displayName", "octocat")
                                 .add("id", "1")
@@ -232,7 +232,7 @@ public Response act(final Request req) throws IOException {
                                 .iterator().next(),
                             Matchers.containsString(PsGoogleTest.GOOGLE_TOKEN)
                         );
-                        return new RsJSON(
+                        return new RsJson(
                             Json.createObjectBuilder()
                                 .add("id", "1")
                                 .add(
@@ -318,7 +318,7 @@ public Response act(final Request req) throws IOException {
                         PsGoogleTest.CODE,
                         PsGoogleTest.CODE
                     );
-                    return new RsJSON(
+                    return new RsJson(
                         Json.createObjectBuilder()
                             .add(
                                 PsGoogleTest.ACCESS_TOKEN,
@@ -352,9 +352,9 @@ private static void assertParam(final Request req,
      * @return Json with error.
      * @throws IOException If some problem inside
      */
-    private static RsJSON createErrorJson() throws IOException {
+    private static RsJson createErrorJson() throws IOException {
         final String message = "message";
-        return new RsJSON(
+        return new RsJson(
             Json.createObjectBuilder()
                 .add(
                     "error",
diff --git a/src/test/java/org/takes/facets/auth/social/PsLinkedinTest.java b/src/test/java/org/takes/facets/auth/social/PsLinkedinTest.java
index ec7765fcb..1a114b8b6 100644
--- a/src/test/java/org/takes/facets/auth/social/PsLinkedinTest.java
+++ b/src/test/java/org/takes/facets/auth/social/PsLinkedinTest.java
@@ -44,7 +44,7 @@
 import org.takes.rq.RqFake;
 import org.takes.rq.RqHref;
 import org.takes.rq.RqPrint;
-import org.takes.rs.RsJSON;
+import org.takes.rs.RsJson;
 
 /**
  * Test case for {@link PsLinkedin}.
@@ -93,7 +93,7 @@ public Response act(final Request req) throws IOException {
                             new RqHref.Base(req).href().toString(),
                             Matchers.endsWith("/uas/oauth2/accessToken")
                         );
-                        return new RsJSON(
+                        return new RsJson(
                             Json.createObjectBuilder()
                                 .add(
                                     "access_token",
@@ -108,7 +108,7 @@ public Response act(final Request req) throws IOException {
                 new Take() {
                     @Override
                     public Response act(final Request req) throws IOException {
-                        return new RsJSON(
+                        return new RsJson(
                             Json.createObjectBuilder()
                                 .add("id", identifier)
                                 .add("firstName", "Frodo")
diff --git a/src/test/java/org/takes/facets/fork/TkConsumesTest.java b/src/test/java/org/takes/facets/fork/TkConsumesTest.java
index 44c4b0d37..92f378337 100644
--- a/src/test/java/org/takes/facets/fork/TkConsumesTest.java
+++ b/src/test/java/org/takes/facets/fork/TkConsumesTest.java
@@ -36,7 +36,7 @@
 import org.takes.Take;
 import org.takes.rq.RqFake;
 import org.takes.rs.RsEmpty;
-import org.takes.rs.RsJSON;
+import org.takes.rs.RsJson;
 import org.takes.rs.RsPrint;
 import org.takes.tk.TkFixed;
 
@@ -56,7 +56,7 @@ public final class TkConsumesTest {
     @Test
     public void acceptsCorrectContentTypeRequest() throws IOException {
         final Take consumes = new TkConsumes(
-            new TkFixed(new RsJSON(new RsEmpty())),
+            new TkFixed(new RsJson(new RsEmpty())),
             "application/json"
         );
         final Response response = consumes.act(
@@ -86,7 +86,7 @@ public void acceptsCorrectContentTypeRequest() throws IOException {
     @Test(expected = HttpException.class)
     public void failsOnUnsupportedAcceptHeader() throws IOException {
         final Take consumes = new TkConsumes(
-            new TkFixed(new RsJSON(new RsEmpty())),
+            new TkFixed(new RsJson(new RsEmpty())),
             "application/json"
         );
         consumes.act(
diff --git a/src/test/java/org/takes/facets/fork/TkProducesTest.java b/src/test/java/org/takes/facets/fork/TkProducesTest.java
index b4cbc97f6..5b2214981 100644
--- a/src/test/java/org/takes/facets/fork/TkProducesTest.java
+++ b/src/test/java/org/takes/facets/fork/TkProducesTest.java
@@ -34,7 +34,7 @@
 import org.takes.Take;
 import org.takes.rq.RqFake;
 import org.takes.rs.RsEmpty;
-import org.takes.rs.RsJSON;
+import org.takes.rs.RsJson;
 import org.takes.rs.RsPrint;
 import org.takes.tk.TkEmpty;
 import org.takes.tk.TkFixed;
@@ -76,7 +76,7 @@ public void failsOnUnsupportedAcceptHeader() throws IOException {
     @Test
     public void producesCorrectContentTypeResponse() throws IOException {
         final Take produces = new TkProduces(
-            new TkFixed(new RsJSON(new RsEmpty())),
+            new TkFixed(new RsJson(new RsEmpty())),
             "text/json"
         );
         final Response response = produces.act(
diff --git a/src/test/java/org/takes/facets/hamcrest/HmRsStatusTest.java b/src/test/java/org/takes/facets/hamcrest/HmRsStatusTest.java
index 6deb2099c..8f2a74a43 100644
--- a/src/test/java/org/takes/facets/hamcrest/HmRsStatusTest.java
+++ b/src/test/java/org/takes/facets/hamcrest/HmRsStatusTest.java
@@ -30,7 +30,7 @@
 import org.junit.Test;
 import org.takes.rq.RqFake;
 import org.takes.tk.TkEmpty;
-import org.takes.tk.TkHTML;
+import org.takes.tk.TkHtml;
 
 /**
  * Test case for {@link HmRsStatus}.
@@ -45,9 +45,9 @@ public final class HmRsStatusTest {
      * @throws IOException If some problem inside
      */
     @Test
-    public void testsStatusOK() throws IOException {
+    public void testsStatusOk() throws IOException {
         MatcherAssert.assertThat(
-            new TkHTML("<html></html>").act(new RqFake()),
+            new TkHtml("<html></html>").act(new RqFake()),
             new HmRsStatus(HttpURLConnection.HTTP_OK)
         );
         MatcherAssert.assertThat(
@@ -63,7 +63,7 @@ public void testsStatusOK() throws IOException {
     @Test
     public void testsStatusNotFound() throws IOException {
         MatcherAssert.assertThat(
-            new TkHTML("<html><body/></html>").act(new RqFake()),
+            new TkHtml("<html><body/></html>").act(new RqFake()),
             Matchers.not(
                 new HmRsStatus(
                     HttpURLConnection.HTTP_NOT_FOUND
diff --git a/src/test/java/org/takes/http/BkTimeableTest.java b/src/test/java/org/takes/http/BkTimeableTest.java
index a1d2c8c7e..e297e0cc4 100644
--- a/src/test/java/org/takes/http/BkTimeableTest.java
+++ b/src/test/java/org/takes/http/BkTimeableTest.java
@@ -93,7 +93,7 @@ public Response act(final Request req) {
                 @Override
                 public void run() {
                     try {
-                        new FtCLI(
+                        new FtCli(
                             take,
                             String.format("--port=%s", file.getAbsoluteFile()),
                             "--threads=1",
diff --git a/src/test/java/org/takes/http/FtBasicTest.java b/src/test/java/org/takes/http/FtBasicTest.java
index 959fe21d9..937b1f1be 100644
--- a/src/test/java/org/takes/http/FtBasicTest.java
+++ b/src/test/java/org/takes/http/FtBasicTest.java
@@ -44,7 +44,7 @@
 import org.takes.rq.RqLengthAware;
 import org.takes.rq.RqMethod;
 import org.takes.rq.RqPrint;
-import org.takes.rs.RsHTML;
+import org.takes.rs.RsHtml;
 import org.takes.rs.RsText;
 import org.takes.tk.TkFailure;
 
@@ -247,13 +247,13 @@ public void exec(final URI home) throws IOException {
      * @throws IOException If some problem inside
      */
     @Test
-    public void consumesTwiceInputStreamWithRsHTML() throws IOException {
+    public void consumesTwiceInputStreamWithRsHtml() throws IOException {
         final String result = "Hello RsHTML!";
         new FtRemote(
             new TkFork(
                 new FkRegex(
                     FtBasicTest.ROOT_PATH,
-                    new RsHTML(
+                    new RsHtml(
                         new ByteArrayInputStream(
                             new Utf8String(result).bytes()
                         )
diff --git a/src/test/java/org/takes/http/FtCLITest.java b/src/test/java/org/takes/http/FtCliTest.java
similarity index 97%
rename from src/test/java/org/takes/http/FtCLITest.java
rename to src/test/java/org/takes/http/FtCliTest.java
index ef42e5052..337b1e430 100644
--- a/src/test/java/org/takes/http/FtCLITest.java
+++ b/src/test/java/org/takes/http/FtCliTest.java
@@ -38,13 +38,13 @@
 import org.takes.facets.fork.TkFork;
 
 /**
- * Test case for {@link FtCLI}.
+ * Test case for {@link FtCli}.
  * @author Yegor Bugayenko (yegor@teamed.io)
  * @version $Id$
  * @since 0.1
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
-public final class FtCLITest {
+public final class FtCliTest {
 
     /**
      * Temp directory.
@@ -74,7 +74,7 @@ public boolean ready() {
                 @Override
                 public void run() {
                     try {
-                        new FtCLI(
+                        new FtCli(
                             new TkFork(new FkRegex("/", "hello!")),
                             String.format("--port=%s", file.getAbsoluteFile()),
                             "--threads=1",
diff --git a/src/test/java/org/takes/http/MainRemoteTest.java b/src/test/java/org/takes/http/MainRemoteTest.java
index cfb2639c5..f5f8f68a0 100644
--- a/src/test/java/org/takes/http/MainRemoteTest.java
+++ b/src/test/java/org/takes/http/MainRemoteTest.java
@@ -98,7 +98,7 @@ private DemoApp() {
          * @throws IOException If fails
          */
         public static void main(final String... args) throws IOException {
-            new FtCLI(new TkFixed("works fine!"), args).start(Exit.NEVER);
+            new FtCli(new TkFixed("works fine!"), args).start(Exit.NEVER);
         }
     }
 
@@ -118,7 +118,7 @@ private DemoAppArgs() {
          * @throws IOException If fails
          */
         public static void main(final String... args) throws IOException {
-            new FtCLI(new TkFixed(args[1]), args[0]).start(Exit.NEVER);
+            new FtCli(new TkFixed(args[1]), args[0]).start(Exit.NEVER);
         }
     }
 
diff --git a/src/test/java/org/takes/misc/HrefTest.java b/src/test/java/org/takes/misc/HrefTest.java
index 90e1d6467..c4285add1 100644
--- a/src/test/java/org/takes/misc/HrefTest.java
+++ b/src/test/java/org/takes/misc/HrefTest.java
@@ -105,7 +105,7 @@ public void acceptsEncodedQuery() {
      * Href can accept non properly encoded URL.
      */
     @Test
-    public void acceptsNonProperlyEncodedURL() {
+    public void acceptsNonProperlyEncodedUrl() {
         MatcherAssert.assertThat(
             // @checkstyle LineLength (2 lines)
             new Href("http://www.netbout.com/[foo/bar]/read?file=%5B%5D%28%29.txt").toString(),
diff --git a/src/test/java/org/takes/rq/RqMethodTest.java b/src/test/java/org/takes/rq/RqMethodTest.java
index ffbff7746..2b5cd72fe 100644
--- a/src/test/java/org/takes/rq/RqMethodTest.java
+++ b/src/test/java/org/takes/rq/RqMethodTest.java
@@ -88,7 +88,7 @@ public void supportsExtensionMethods() throws IOException {
      * @throws IOException If some problem inside
      */
     @Test(expected = IOException.class)
-    public void failsOnMissingURI() throws IOException {
+    public void failsOnMissingUri() throws IOException {
         new RqMethod.Base(new RqSimple(Arrays.asList("GET"), null)).method();
     }
 
diff --git a/src/test/java/org/takes/rs/BodyTest.java b/src/test/java/org/takes/rs/BodyTest.java
index 2acba8b69..efa4163c7 100644
--- a/src/test/java/org/takes/rs/BodyTest.java
+++ b/src/test/java/org/takes/rs/BodyTest.java
@@ -137,7 +137,7 @@ public void returnsCorrectLengthWithTemFile() throws Exception {
      * @throws Exception If some problem inside.
      */
     @Test
-    public void returnsCorrectInputWithURL() throws Exception {
+    public void returnsCorrectInputWithUrl() throws Exception {
         final Path file = BodyTest.createTempFile();
         try {
             final byte[] bytes =
@@ -146,7 +146,7 @@ public void returnsCorrectInputWithURL() throws Exception {
                 Files.copy(input, file, StandardCopyOption.REPLACE_EXISTING);
             }
             try (final InputStream input =
-                new Body.URL(file.toUri().toURL()).input()) {
+                new Body.Url(file.toUri().toURL()).input()) {
                 MatcherAssert.assertThat(
                     ByteStreams.toByteArray(input),
                     Matchers.equalTo(bytes)
@@ -162,7 +162,7 @@ public void returnsCorrectInputWithURL() throws Exception {
      * @throws Exception If some problem inside.
      */
     @Test
-    public void returnsCorrectLengthWithURL() throws Exception {
+    public void returnsCorrectLengthWithUrl() throws Exception {
         final Path file = BodyTest.createTempFile();
         try {
             final byte[] bytes =
@@ -171,7 +171,7 @@ public void returnsCorrectLengthWithURL() throws Exception {
                 Files.copy(input, file, StandardCopyOption.REPLACE_EXISTING);
             }
             MatcherAssert.assertThat(
-                new Body.URL(file.toUri().toURL()).length(),
+                new Body.Url(file.toUri().toURL()).length(),
                 Matchers.equalTo(bytes.length)
             );
         } finally {
diff --git a/src/test/java/org/takes/rs/RsJSONTest.java b/src/test/java/org/takes/rs/RsJsonTest.java
similarity index 94%
rename from src/test/java/org/takes/rs/RsJSONTest.java
rename to src/test/java/org/takes/rs/RsJsonTest.java
index f8b5b5be8..40c123d7d 100644
--- a/src/test/java/org/takes/rs/RsJSONTest.java
+++ b/src/test/java/org/takes/rs/RsJsonTest.java
@@ -32,12 +32,12 @@
 import org.junit.Test;
 
 /**
- * Test case for {@link RsJSON}.
+ * Test case for {@link RsJson}.
  * @author Yegor Bugayenko (yegor@teamed.io)
  * @version $Id$
  * @since 0.1
  */
-public final class RsJSONTest {
+public final class RsJsonTest {
 
     /**
      * RsJSON can build JSON response.
@@ -51,7 +51,7 @@ public void buildsJsonResponse() throws IOException {
             .build();
         MatcherAssert.assertThat(
             Json.createReader(
-                new RsJSON(json).body()
+                new RsJson(json).body()
             ).readObject().getString(key),
             Matchers.startsWith("Jeffrey")
         );
@@ -72,7 +72,7 @@ public void buildsBigJsonResponse() throws IOException {
         }
         MatcherAssert.assertThat(
             Json.createReader(
-                new RsJSON(builder.build()).body()
+                new RsJson(builder.build()).body()
             ).readArray().size(),
             Matchers.equalTo(size)
         );
diff --git a/src/test/java/org/takes/rs/RsPrettyJSONTest.java b/src/test/java/org/takes/rs/RsPrettyJsonTest.java
similarity index 92%
rename from src/test/java/org/takes/rs/RsPrettyJSONTest.java
rename to src/test/java/org/takes/rs/RsPrettyJsonTest.java
index 1b352b3b8..eb7dc9257 100644
--- a/src/test/java/org/takes/rs/RsPrettyJSONTest.java
+++ b/src/test/java/org/takes/rs/RsPrettyJsonTest.java
@@ -32,12 +32,12 @@
 import org.junit.Test;
 
 /**
- * Test case for {@link RsPrettyJSON}.
+ * Test case for {@link RsPrettyJson}.
  * @author Eugene Kondrashev (eugene.kondrashev@gmail.com)
  * @version $Id$
  * @since 1.0
  */
-public final class RsPrettyJSONTest {
+public final class RsPrettyJsonTest {
 
     /**
      * RsPrettyJSON can format response with JSON body.
@@ -47,7 +47,7 @@ public final class RsPrettyJSONTest {
     public void formatsJsonBody() throws Exception {
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsPrettyJSON(
+                new RsPrettyJson(
                     new RsWithBody("{\"widget\": {\"debug\": \"on\" }}")
                 )
             ).printBody(),
@@ -63,7 +63,7 @@ public void formatsJsonBody() throws Exception {
      */
     @Test(expected = IOException.class)
     public void rejectsNonJsonBody() throws Exception {
-        new RsPrint(new RsPrettyJSON(new RsWithBody("foo"))).printBody();
+        new RsPrint(new RsPrettyJson(new RsWithBody("foo"))).printBody();
     }
 
     /**
@@ -80,7 +80,7 @@ public void reportsCorrectContentLength() throws Exception {
         ).printBody(baos);
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsPrettyJSON(
+                new RsPrettyJson(
                     new RsWithBody("{\"test\": {\"test\": \"test\" }}")
                 )
             ).printHead(),
@@ -99,7 +99,7 @@ public void reportsCorrectContentLength() throws Exception {
      */
     @Test
     public void conformsToEqualsAndHashCode() throws Exception {
-        EqualsVerifier.forClass(RsPrettyJSON.class)
+        EqualsVerifier.forClass(RsPrettyJson.class)
             .suppress(Warning.TRANSIENT_FIELDS)
             .withRedefinedSuperclass()
             .verify();
diff --git a/src/test/java/org/takes/rs/RsPrettyXMLTest.java b/src/test/java/org/takes/rs/RsPrettyXmlTest.java
similarity index 94%
rename from src/test/java/org/takes/rs/RsPrettyXMLTest.java
rename to src/test/java/org/takes/rs/RsPrettyXmlTest.java
index 6e6564650..670f12775 100644
--- a/src/test/java/org/takes/rs/RsPrettyXMLTest.java
+++ b/src/test/java/org/takes/rs/RsPrettyXmlTest.java
@@ -33,12 +33,12 @@
 import org.junit.Test;
 
 /**
- * Test case for {@link RsPrettyXML}.
+ * Test case for {@link RsPrettyXml}.
  * @author Igor Khvostenkov (ikhvostenkov@gmail.com)
  * @version $Id$
  * @since 1.0
  */
-public final class RsPrettyXMLTest {
+public final class RsPrettyXmlTest {
 
     /**
      * RsPrettyXML can format response with XML body.
@@ -48,7 +48,7 @@ public final class RsPrettyXMLTest {
     public void formatsXmlBody() throws IOException {
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsPrettyXML(
+                new RsPrettyXml(
                     new RsWithBody("<test><a>foo</a></test>")
                 )
             ).printBody(),
@@ -65,7 +65,7 @@ public void formatsXmlBody() throws IOException {
     public void formatsHtml5DoctypeBody() throws IOException {
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsPrettyXML(
+                new RsPrettyXml(
                     new RsWithBody(
                         "<!DOCTYPE html><html><head></head><body></body></html>"
                     )
@@ -85,7 +85,7 @@ public void formatsHtml5DoctypeBody() throws IOException {
     public void formatsHtml5ForLegacyBrowsersDoctypeBody() throws IOException {
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsPrettyXML(
+                new RsPrettyXml(
                     new RsWithBody(
                         Joiner.on("").appendTo(
                             new StringBuilder("<!DOCTYPE html "),
@@ -124,7 +124,7 @@ public void formatsHtml4DoctypeBody() throws IOException {
             .concat("lang=\"en\">");
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsPrettyXML(
+                new RsPrettyXml(
                     new RsWithBody(
                         Joiner.on("").appendTo(
                             new StringBuilder("<!DOCTYPE HTML "),
@@ -158,7 +158,7 @@ public void formatsHtml4DoctypeBody() throws IOException {
      */
     @Test(expected = IOException.class)
     public void formatsNonXmlBody() throws IOException {
-        new RsPrint(new RsPrettyXML(new RsWithBody("foo"))).printBody();
+        new RsPrint(new RsPrettyXml(new RsWithBody("foo"))).printBody();
     }
 
     /**
@@ -175,7 +175,7 @@ public void reportsCorrectContentLength() throws IOException {
         ).printBody(baos);
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsPrettyXML(
+                new RsPrettyXml(
                     new RsWithBody("<test><a>test</a></test>")
                 )
             ).printHead(),
@@ -194,7 +194,7 @@ public void reportsCorrectContentLength() throws IOException {
      */
     @Test
     public void conformsToEqualsAndHashCode() throws Exception {
-        EqualsVerifier.forClass(RsPrettyXML.class)
+        EqualsVerifier.forClass(RsPrettyXml.class)
             .suppress(Warning.TRANSIENT_FIELDS)
             .withRedefinedSuperclass()
             .verify();
diff --git a/src/test/java/org/takes/rs/RsWithTypeTest.java b/src/test/java/org/takes/rs/RsWithTypeTest.java
index 32252f076..f0335b2ca 100644
--- a/src/test/java/org/takes/rs/RsWithTypeTest.java
+++ b/src/test/java/org/takes/rs/RsWithTypeTest.java
@@ -142,7 +142,7 @@ public void doesNotReplaceResponseCode() throws Exception {
     public void replacesTypeWithHtml() throws Exception {
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsWithType.HTML(
+                new RsWithType.Html(
                     new RsWithType(new RsEmpty(), RsWithTypeTest.TYPE_XML)
                 )
             ).print(),
@@ -160,7 +160,7 @@ public void replacesTypeWithHtml() throws Exception {
         );
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsWithType.HTML(
+                new RsWithType.Html(
                     new RsWithType(new RsEmpty(), RsWithTypeTest.TYPE_XML),
                     StandardCharsets.ISO_8859_1
                 )
@@ -188,7 +188,7 @@ public void replacesTypeWithHtml() throws Exception {
     public void replacesTypeWithJson() throws Exception {
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsWithType.JSON(
+                new RsWithType.Json(
                     new RsWithType(new RsEmpty(), RsWithTypeTest.TYPE_XML)
                 )
             ).print(),
@@ -206,7 +206,7 @@ public void replacesTypeWithJson() throws Exception {
         );
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsWithType.JSON(
+                new RsWithType.Json(
                     new RsWithType(new RsEmpty(), RsWithTypeTest.TYPE_XML),
                     StandardCharsets.ISO_8859_1
                 )
@@ -234,7 +234,7 @@ public void replacesTypeWithJson() throws Exception {
     public void replacesTypeWithXml() throws Exception {
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsWithType.XML(
+                new RsWithType.Xml(
                     new RsWithType(new RsEmpty(), RsWithTypeTest.TYPE_HTML)
                 )
             ).print(),
@@ -251,7 +251,7 @@ public void replacesTypeWithXml() throws Exception {
         );
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsWithType.XML(
+                new RsWithType.Xml(
                     new RsWithType(new RsEmpty(), RsWithTypeTest.TYPE_HTML),
                     StandardCharsets.ISO_8859_1
                 )
diff --git a/src/test/java/org/takes/rs/RsXSLTTest.java b/src/test/java/org/takes/rs/RsXsltTest.java
similarity index 97%
rename from src/test/java/org/takes/rs/RsXSLTTest.java
rename to src/test/java/org/takes/rs/RsXsltTest.java
index 1e417c2e0..c53532aa2 100644
--- a/src/test/java/org/takes/rs/RsXSLTTest.java
+++ b/src/test/java/org/takes/rs/RsXsltTest.java
@@ -39,12 +39,12 @@
 import org.takes.misc.StateAwareInputStream;
 
 /**
- * Test case for {@link RsXSLT}.
+ * Test case for {@link RsXslt}.
  * @author Yegor Bugayenko (yegor@teamed.io)
  * @version $Id$
  * @since 0.1
  */
-public final class RsXSLTTest {
+public final class RsXsltTest {
 
     /**
      * Validate encoding.
@@ -77,7 +77,7 @@ public void convertsXmlToHtml() throws IOException {
         );
         MatcherAssert.assertThat(
             IOUtils.toString(
-                new RsXSLT(
+                new RsXslt(
                     new RsText(xml),
                     new URIResolver() {
                         @Override
@@ -110,7 +110,7 @@ public void convertsXmlToPlainText() throws IOException {
         );
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsXSLT(
+                new RsXslt(
                     new RsText(xml),
                     new URIResolver() {
                         @Override
@@ -146,7 +146,7 @@ public void closesDecoratedResponseInputStream() throws Exception {
             new StateAwareInputStream(IOUtils.toInputStream(xml));
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsXSLT(
+                new RsXslt(
                     new RsText(stream),
                     new URIResolver() {
                         @Override
@@ -173,7 +173,7 @@ public Source resolve(final String href,
     public void resolvesInClasspath() throws IOException {
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsXSLT(
+                new RsXslt(
                     new RsText(
                         Joiner.on(' ').join(
                             "<?xml-stylesheet",
@@ -188,7 +188,7 @@ public void resolvesInClasspath() throws IOException {
         );
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsXSLT(
+                new RsXslt(
                     new RsText(
                         Joiner.on(' ').join(
                             "<?xml-stylesheet ",
@@ -203,7 +203,7 @@ public void resolvesInClasspath() throws IOException {
         );
         MatcherAssert.assertThat(
             new RsPrint(
-                new RsXSLT(
+                new RsXslt(
                     new RsText(
                         Joiner.on(' ').join(
                             "<?xml-stylesheet  ",
diff --git a/src/test/java/org/takes/rs/xe/XeSLATest.java b/src/test/java/org/takes/rs/xe/XeSlaTest.java
similarity index 95%
rename from src/test/java/org/takes/rs/xe/XeSLATest.java
rename to src/test/java/org/takes/rs/xe/XeSlaTest.java
index 70ac349a6..89515668c 100644
--- a/src/test/java/org/takes/rs/xe/XeSLATest.java
+++ b/src/test/java/org/takes/rs/xe/XeSlaTest.java
@@ -30,12 +30,12 @@
 import org.junit.Test;
 
 /**
- * Test case for {@link XeSLA}.
+ * Test case for {@link XeSla}.
  * @author Yegor Bugayenko (yegor@teamed.io)
  * @version $Id$
  * @since 0.3
  */
-public final class XeSLATest {
+public final class XeSlaTest {
 
     /**
      * XeSLA can build XML response.
@@ -48,7 +48,7 @@ public void buildsXmlResponse() throws IOException {
                 new RsXembly(
                     new XeAppend(
                         "root",
-                        new XeSLA()
+                        new XeSla()
                     )
                 ).body()
             ),
diff --git a/src/test/java/org/takes/tk/TkCORSTest.java b/src/test/java/org/takes/tk/TkCorsTest.java
similarity index 96%
rename from src/test/java/org/takes/tk/TkCORSTest.java
rename to src/test/java/org/takes/tk/TkCorsTest.java
index e60327091..9afbc13a8 100644
--- a/src/test/java/org/takes/tk/TkCORSTest.java
+++ b/src/test/java/org/takes/tk/TkCorsTest.java
@@ -34,12 +34,12 @@
 import org.takes.rs.RsText;
 
 /**
- * Test case for {@link TkCORS}.
+ * Test case for {@link TkCors}.
  * @author Endrigo Antonini (teamed@endrigo.com.br)
  * @version $Id$
  * @since 0.20
  */
-public final class TkCORSTest {
+public final class TkCorsTest {
 
     /**
      * TkCORS can handle connections without origin in the request.
@@ -49,7 +49,7 @@ public final class TkCORSTest {
     public void handleConnectionsWithoutOriginInTheRequest() throws Exception {
         MatcherAssert.assertThat(
             "It was expected to receive a 403 error.",
-            new TkCORS(
+            new TkCors(
                 new TkFixed(new RsText()),
                 "http://www.netbout.io",
                 "http://www.example.com"
@@ -66,7 +66,7 @@ public void handleConnectionsWithoutOriginInTheRequest() throws Exception {
     public void handleConnectionsWithCorrectDomainOnOrigin() throws Exception {
         MatcherAssert.assertThat(
             "Invalid HTTP status for a request with correct domain.",
-            new TkCORS(
+            new TkCors(
                 new TkFixed(new RsText()),
                 "http://teamed.io",
                 "http://example.com"
@@ -90,7 +90,7 @@ public void cantHandleConnectionsWithWrongDomainOnOrigin()
         MatcherAssert.assertThat(
             "Wrong value on header.",
             new RsPrint(
-                new TkCORS(
+                new TkCors(
                     new TkFixed(new RsText()),
                     "http://www.teamed.io",
                     "http://sample.com"
diff --git a/src/test/java/org/takes/tk/TkHTMLTest.java b/src/test/java/org/takes/tk/TkHtmlTest.java
similarity index 93%
rename from src/test/java/org/takes/tk/TkHTMLTest.java
rename to src/test/java/org/takes/tk/TkHtmlTest.java
index d5b69060a..5dfaa6adc 100644
--- a/src/test/java/org/takes/tk/TkHTMLTest.java
+++ b/src/test/java/org/takes/tk/TkHtmlTest.java
@@ -33,12 +33,12 @@
 import org.takes.rs.RsPrint;
 
 /**
- * Test case for {@link TkHTML}.
+ * Test case for {@link TkHtml}.
  * @author Yegor Bugayenko (yegor@teamed.io)
  * @version $Id$
  * @since 0.10
  */
-public final class TkHTMLTest {
+public final class TkHtmlTest {
 
     /**
      * TkHTML can create a text.
@@ -48,7 +48,7 @@ public final class TkHTMLTest {
     public void createsTextResponse() throws IOException {
         final String body = "<html>hello, world!</html>";
         MatcherAssert.assertThat(
-            new RsPrint(new TkHTML(body).act(new RqFake())).print(),
+            new RsPrint(new TkHtml(body).act(new RqFake())).print(),
             Matchers.equalTo(
                 Joiner.on("\r\n").join(
                     "HTTP/1.1 200 OK",
@@ -68,7 +68,7 @@ public void createsTextResponse() throws IOException {
     @Test
     public void printsResourceMultipleTimes() throws IOException {
         final String body = "<html>hello, dude!</html>";
-        final Take take = new TkHTML(body);
+        final Take take = new TkHtml(body);
         MatcherAssert.assertThat(
             new RsPrint(take.act(new RqFake())).print(),
             Matchers.containsString(body)
diff --git a/src/test/java/org/takes/tk/TkRedirectTest.java b/src/test/java/org/takes/tk/TkRedirectTest.java
index c0ba571ac..cdd258517 100644
--- a/src/test/java/org/takes/tk/TkRedirectTest.java
+++ b/src/test/java/org/takes/tk/TkRedirectTest.java
@@ -53,7 +53,7 @@ public final class TkRedirectTest {
      * @throws IOException If some problem inside
      */
     @Test
-    public void createsRedirectResponseWithURL() throws IOException {
+    public void createsRedirectResponseWithUrl() throws IOException {
         final String url = "/about";
         MatcherAssert.assertThat(
             new RsPrint(
@@ -75,7 +75,7 @@ public void createsRedirectResponseWithURL() throws IOException {
      * @throws IOException If some problem inside
      */
     @Test
-    public void createsRedirectResponseWithURLAndStatus() throws IOException {
+    public void createsRedirectResponseWithUrlAndStatus() throws IOException {
         final String url = "/";
         MatcherAssert.assertThat(
             new RsPrint(

From a1a43dced7942f6e7a05245f8e5d65fad685bd96 Mon Sep 17 00:00:00 2001
From: Maksimenko Vladimir <xupypr@xupypr.com>
Date: Sat, 18 Jun 2016 18:49:05 +0300
Subject: [PATCH 2/5] SuppressWarnings + puzzle

---
 src/main/java/org/takes/rs/RsPrettyJson.java | 1 +
 src/main/java/org/takes/rs/RsPrettyXml.java  | 1 +
 src/main/java/org/takes/tk/TkCors.java       | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/src/main/java/org/takes/rs/RsPrettyJson.java b/src/main/java/org/takes/rs/RsPrettyJson.java
index aa425cb25..e00778a53 100644
--- a/src/main/java/org/takes/rs/RsPrettyJson.java
+++ b/src/main/java/org/takes/rs/RsPrettyJson.java
@@ -49,6 +49,7 @@
  * @version $Id$
  * @since 1.0
  */
+@SuppressWarnings("PMD.AvoidDuplicateLiterals")
 @ToString(of = "origin")
 @EqualsAndHashCode(of = "origin")
 public final class RsPrettyJson implements Response {
diff --git a/src/main/java/org/takes/rs/RsPrettyXml.java b/src/main/java/org/takes/rs/RsPrettyXml.java
index d199a0256..cab9cad54 100644
--- a/src/main/java/org/takes/rs/RsPrettyXml.java
+++ b/src/main/java/org/takes/rs/RsPrettyXml.java
@@ -55,6 +55,7 @@
  * @version $Id$
  * @since 1.0
  */
+@SuppressWarnings("PMD.AvoidDuplicateLiterals")
 @ToString(of = "origin")
 @EqualsAndHashCode(of = "origin")
 public final class RsPrettyXml implements Response {
diff --git a/src/main/java/org/takes/tk/TkCors.java b/src/main/java/org/takes/tk/TkCors.java
index 468e32a56..7d5a900f5 100644
--- a/src/main/java/org/takes/tk/TkCors.java
+++ b/src/main/java/org/takes/tk/TkCors.java
@@ -34,6 +34,7 @@
 import org.takes.Response;
 import org.takes.Take;
 import org.takes.rq.RqHeaders;
+import org.takes.rs.RsPrettyJson;
 import org.takes.rs.RsWithHeaders;
 import org.takes.rs.RsWithStatus;
 
@@ -50,7 +51,12 @@
  * @author Endrigo Antonini (teamed@endrigo.com.br)
  * @version $Id$
  * @since 0.20
+ *
+ * @todo #684:15min Remove PMD.AvoidDuplicateLiterals exclude here and in
+ *  {@link RsPrettyJson}, {@link RsPrettyXml}. Note that this puzzle depends on
+ *  https://github.com/teamed/qulice/issues/760.
  */
+@SuppressWarnings("PMD.AvoidDuplicateLiterals")
 @ToString(of = { "origin", "allowed" })
 @EqualsAndHashCode(of = { "origin", "allowed" })
 public final class TkCors implements Take {

From 9929a1f5411c9c6b799f786c53e358470e51728d Mon Sep 17 00:00:00 2001
From: Maksimenko Vladimir <xupypr@xupypr.com>
Date: Sat, 18 Jun 2016 21:00:36 +0300
Subject: [PATCH 3/5] puzzle upd

---
 src/main/java/org/takes/tk/TkCors.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/takes/tk/TkCors.java b/src/main/java/org/takes/tk/TkCors.java
index 7d5a900f5..8036042a3 100644
--- a/src/main/java/org/takes/tk/TkCors.java
+++ b/src/main/java/org/takes/tk/TkCors.java
@@ -54,7 +54,8 @@
  *
  * @todo #684:15min Remove PMD.AvoidDuplicateLiterals exclude here and in
  *  {@link RsPrettyJson}, {@link RsPrettyXml}. Note that this puzzle depends on
- *  https://github.com/teamed/qulice/issues/760.
+ *  https://github.com/teamed/qulice/issues/760. Also remove some of PMD
+ *  excludes that are mentioned in https://github.com/yegor256/takes/issues/686
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 @ToString(of = { "origin", "allowed" })

From fe6e6bc8d4f23579478f097cd527e1b1f074ef8a Mon Sep 17 00:00:00 2001
From: Maksimenko Vladimir <xupypr@xupypr.com>
Date: Mon, 20 Jun 2016 01:36:04 +0300
Subject: [PATCH 4/5] upd

---
 src/main/java/org/takes/tk/TkCors.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/takes/tk/TkCors.java b/src/main/java/org/takes/tk/TkCors.java
index 8036042a3..89a8f1818 100644
--- a/src/main/java/org/takes/tk/TkCors.java
+++ b/src/main/java/org/takes/tk/TkCors.java
@@ -34,7 +34,6 @@
 import org.takes.Response;
 import org.takes.Take;
 import org.takes.rq.RqHeaders;
-import org.takes.rs.RsPrettyJson;
 import org.takes.rs.RsWithHeaders;
 import org.takes.rs.RsWithStatus;
 
@@ -51,7 +50,6 @@
  * @author Endrigo Antonini (teamed@endrigo.com.br)
  * @version $Id$
  * @since 0.20
- *
  * @todo #684:15min Remove PMD.AvoidDuplicateLiterals exclude here and in
  *  {@link RsPrettyJson}, {@link RsPrettyXml}. Note that this puzzle depends on
  *  https://github.com/teamed/qulice/issues/760. Also remove some of PMD

From 097bea8c385305f4215c2fbe20395389699754bf Mon Sep 17 00:00:00 2001
From: Maksimenko Vladimir <xupypr@xupypr.com>
Date: Mon, 20 Jun 2016 02:10:40 +0300
Subject: [PATCH 5/5] upd

---
 src/main/java/org/takes/tk/TkCors.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/takes/tk/TkCors.java b/src/main/java/org/takes/tk/TkCors.java
index 89a8f1818..a1a5d2c0c 100644
--- a/src/main/java/org/takes/tk/TkCors.java
+++ b/src/main/java/org/takes/tk/TkCors.java
@@ -52,8 +52,8 @@
  * @since 0.20
  * @todo #684:15min Remove PMD.AvoidDuplicateLiterals exclude here and in
  *  {@link RsPrettyJson}, {@link RsPrettyXml}. Note that this puzzle depends on
- *  https://github.com/teamed/qulice/issues/760. Also remove some of PMD
- *  excludes that are mentioned in https://github.com/yegor256/takes/issues/686
+ *  https://github.com/teamed/qulice/issues/760. Note that this puzzle has
+ *  partially overlap with https://github.com/yegor256/takes/issues/686
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 @ToString(of = { "origin", "allowed" })