diff --git a/core/src/com/riiablo/logger/Appender.java b/core/src/com/riiablo/logger/Appender.java
index 1882186c..94728a1d 100644
--- a/core/src/com/riiablo/logger/Appender.java
+++ b/core/src/com/riiablo/logger/Appender.java
@@ -2,5 +2,5 @@ package com.riiablo.logger;
 
 public interface Appender {
   void append(LogEvent event);
-  Layouter layout();
+  Encoder encoder();
 }
diff --git a/core/src/com/riiablo/logger/Layouter.java b/core/src/com/riiablo/logger/Encoder.java
similarity index 79%
rename from core/src/com/riiablo/logger/Layouter.java
rename to core/src/com/riiablo/logger/Encoder.java
index b07a6bcb..aaa13753 100644
--- a/core/src/com/riiablo/logger/Layouter.java
+++ b/core/src/com/riiablo/logger/Encoder.java
@@ -2,6 +2,6 @@ package com.riiablo.logger;
 
 import java.io.OutputStream;
 
-public interface Layouter {
+public interface Encoder {
   void encode(LogEvent event, OutputStream out);
 }
diff --git a/core/src/com/riiablo/logger/OutputStreamAppender.java b/core/src/com/riiablo/logger/OutputStreamAppender.java
index 2642ffd8..be0eb17e 100644
--- a/core/src/com/riiablo/logger/OutputStreamAppender.java
+++ b/core/src/com/riiablo/logger/OutputStreamAppender.java
@@ -4,19 +4,19 @@ import java.io.OutputStream;
 
 public class OutputStreamAppender implements Appender {
   private final OutputStream out;
-  private final Layouter layouter = new RiiabloLayouter();
+  private final Encoder encoder = new RiiabloEncoder();
 
   public OutputStreamAppender(OutputStream out) {
     this.out = out;
   }
 
   @Override
-  public Layouter layout() {
-    return layouter;
+  public Encoder encoder() {
+    return encoder;
   }
 
   @Override
   public void append(LogEvent event) {
-    layouter.encode(event, out);
+    encoder.encode(event, out);
   }
 }
diff --git a/core/src/com/riiablo/logger/RiiabloLayouter.java b/core/src/com/riiablo/logger/RiiabloEncoder.java
similarity index 94%
rename from core/src/com/riiablo/logger/RiiabloLayouter.java
rename to core/src/com/riiablo/logger/RiiabloEncoder.java
index 4a1bcac5..14c18e2e 100644
--- a/core/src/com/riiablo/logger/RiiabloLayouter.java
+++ b/core/src/com/riiablo/logger/RiiabloEncoder.java
@@ -5,7 +5,7 @@ import org.apache.commons.lang3.ClassUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
-public class RiiabloLayouter extends SimpleLayouter {
+public class RiiabloEncoder extends SimpleEncoder {
   private final StringBuilder buffer = new StringBuilder(1024);
 
   @Override
diff --git a/core/src/com/riiablo/logger/SimpleLayouter.java b/core/src/com/riiablo/logger/SimpleEncoder.java
similarity index 91%
rename from core/src/com/riiablo/logger/SimpleLayouter.java
rename to core/src/com/riiablo/logger/SimpleEncoder.java
index 675376ae..8fd44f1c 100644
--- a/core/src/com/riiablo/logger/SimpleLayouter.java
+++ b/core/src/com/riiablo/logger/SimpleEncoder.java
@@ -4,7 +4,7 @@ import java.io.OutputStream;
 import java.nio.charset.Charset;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
-public class SimpleLayouter implements Layouter {
+public class SimpleEncoder implements Encoder {
   static final Charset US_ASCII = Charset.forName("US-ASCII");
   final byte[] newLine = System.getProperty("line.separator").getBytes(US_ASCII);