diff --git a/data/script/template/script/template/character/AbstractCharacterTemplate.java b/data/script/template/script/template/character/AbstractCharacterTemplate.java
index c349095d6..0ab9cb5b7 100644
--- a/data/script/template/script/template/character/AbstractCharacterTemplate.java
+++ b/data/script/template/script/template/character/AbstractCharacterTemplate.java
@@ -9,13 +9,13 @@ import com.l2jserver.util.Coordinate;
 public abstract class AbstractCharacterTemplate extends CharacterTemplate {
 	protected AbstractCharacterTemplate(CharacterTemplateID id,
 			CharacterClass characterClass, int intelligence, int strength,
-			int concentration, int mentality, int dextry, int witness,
+			int concentration, int mentality, int dexterity, int witness,
 			int physicalAttack, int magicalAttack, int physicalDefense,
 			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
 			int criticalChance, int evasionChance, int moveSpeed,
 			int maxWeigth, boolean craft, Coordinate spawnLocation) {
 		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dextry, witness, physicalAttack, magicalAttack,
+				mentality, dexterity, witness, physicalAttack, magicalAttack,
 				physicalDefense, magicalDefense, attackSpeed, castSpeed,
 				accuracy, criticalChance, evasionChance, maxWeigth, moveSpeed,
 				craft, spawnLocation);
diff --git a/data/script/template/script/template/character/HumanCharacterTemplate.java b/data/script/template/script/template/character/HumanCharacterTemplate.java
index b895ea812..4b1916d6c 100644
--- a/data/script/template/script/template/character/HumanCharacterTemplate.java
+++ b/data/script/template/script/template/character/HumanCharacterTemplate.java
@@ -8,13 +8,13 @@ import com.l2jserver.util.Coordinate;
 public abstract class HumanCharacterTemplate extends AbstractCharacterTemplate {
 	protected HumanCharacterTemplate(CharacterTemplateID id,
 			CharacterClass characterClass, int intelligence, int strength,
-			int concentration, int mentality, int dextry, int witness,
+			int concentration, int mentality, int dexterity, int witness,
 			int physicalAttack, int magicalAttack, int physicalDefense,
 			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
 			int criticalChance, int evasionChance, int moveSpeed,
 			int maxWeigth, boolean craft, Coordinate spawnLocation) {
 		super(id, characterClass, intelligence, strength, concentration,
-				mentality, dextry, witness, physicalAttack, magicalAttack,
+				mentality, dexterity, witness, physicalAttack, magicalAttack,
 				physicalDefense, magicalDefense, attackSpeed, castSpeed,
 				accuracy, criticalChance, evasionChance, moveSpeed, maxWeigth,
 				false, spawnLocation);
diff --git a/src/main/java/com/l2jserver/game/net/Lineage2Connection.java b/src/main/java/com/l2jserver/game/net/Lineage2Connection.java
index ae46826aa..5967b2635 100644
--- a/src/main/java/com/l2jserver/game/net/Lineage2Connection.java
+++ b/src/main/java/com/l2jserver/game/net/Lineage2Connection.java
@@ -19,7 +19,7 @@ public class Lineage2Connection {
 	private L2Character character;
 	private Lineage2Session session;
 	private ConnectionState state = ConnectionState.CONNECTED;
-	
+
 	public enum ConnectionState {
 		CONNECTED, AUTHENTICATED, IN_GAME;
 	}
diff --git a/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java b/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java
index 029202ab4..0456e7557 100644
--- a/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java
+++ b/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java
@@ -36,13 +36,15 @@ public class Lineage2PipelineFactory implements ChannelPipelineFactory {
 				new Lineage2Encrypter());
 		pipeline.addLast(Lineage2Decrypter.HANDLER_NAME,
 				new Lineage2Decrypter());
-		
-		pipeline.addLast("logger-hex", new LoggingHandler(InternalLogLevel.DEBUG, true));
+
+		pipeline.addLast("logger-hex", new LoggingHandler(
+				InternalLogLevel.DEBUG, true));
 
 		pipeline.addLast("packet.writer", new Lineage2PacketWriter());
 		pipeline.addLast("packet.reader", new Lineage2PacketReader(injector));
-		
-		pipeline.addLast("logger", new LoggingHandler(InternalLogLevel.DEBUG, true));
+
+		pipeline.addLast("logger", new LoggingHandler(InternalLogLevel.DEBUG,
+				true));
 
 		pipeline.addLast("packet.handler", new Lineage2PacketHandler());
 
diff --git a/src/main/java/com/l2jserver/game/net/packet/client/AuthLoginPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/AuthLoginPacket.java
index df30c91e1..787daf375 100644
--- a/src/main/java/com/l2jserver/game/net/packet/client/AuthLoginPacket.java
+++ b/src/main/java/com/l2jserver/game/net/packet/client/AuthLoginPacket.java
@@ -53,8 +53,8 @@ public class AuthLoginPacket extends AbstractClientPacket {
 
 		final List<L2Character> chars = characterDao.selectByAccount(conn
 				.getSession().getUsername());
-//		conn.write(CharacterSelectionListPacket.fromL2Session(
-//				conn.getSession(), chars.toArray(new L2Character[0])));
+		// conn.write(CharacterSelectionListPacket.fromL2Session(
+		// conn.getSession(), chars.toArray(new L2Character[0])));
 		conn.write(new CharacterEnterWorldPacket(chars.get(0), playKey1));
 	}
 
diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterCreatePacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CharacterCreatePacket.java
index b7efe440d..632cecbc6 100644
--- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterCreatePacket.java
+++ b/src/main/java/com/l2jserver/game/net/packet/client/CharacterCreatePacket.java
@@ -53,7 +53,7 @@ public class CharacterCreatePacket extends AbstractClientPacket {
 	private int strength;
 	private int concentration;
 	private int mentality;
-	private int dextry;
+	private int dexterity;
 	private int witness;
 
 	private CharacterHairStyle hairStyle;
@@ -80,7 +80,7 @@ public class CharacterCreatePacket extends AbstractClientPacket {
 		strength = buffer.readInt();
 		concentration = buffer.readInt();
 		mentality = buffer.readInt();
-		dextry = buffer.readInt();
+		dexterity = buffer.readInt();
 		witness = buffer.readInt();
 
 		hairStyle = CharacterHairStyle.fromOption(buffer.readInt());
diff --git a/src/main/java/com/l2jserver/game/net/packet/client/ProtocolVersionPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/ProtocolVersionPacket.java
index eb9bd585b..96e75d893 100644
--- a/src/main/java/com/l2jserver/game/net/packet/client/ProtocolVersionPacket.java
+++ b/src/main/java/com/l2jserver/game/net/packet/client/ProtocolVersionPacket.java
@@ -41,11 +41,10 @@ public class ProtocolVersionPacket extends AbstractClientPacket {
 		// generate a new key
 		final byte[] key = conn.getDecrypter().enable();
 		log.debug("Decrypter has been enabled");
-		
+
 		log.debug("Client protocol version: {}", version);
 		if (L2JConstants.SUPPORTED_PROTOCOL != version) {
-			log.info(
-					"Incorrect protocol version: {0}. Only {1} is supported.",
+			log.info("Incorrect protocol version: {0}. Only {1} is supported.",
 					version, L2JConstants.SUPPORTED_PROTOCOL);
 			// notify wrong protocol and close connection
 			conn.write(new KeyPacket(key, false)).addListener(
diff --git a/src/main/java/com/l2jserver/game/net/packet/client/RequestManorList.java b/src/main/java/com/l2jserver/game/net/packet/client/RequestManorList.java
index e2234bdf5..dc1001e5a 100644
--- a/src/main/java/com/l2jserver/game/net/packet/client/RequestManorList.java
+++ b/src/main/java/com/l2jserver/game/net/packet/client/RequestManorList.java
@@ -30,7 +30,7 @@ public class RequestManorList extends AbstractClientPacket {
 
 	@Override
 	public void process(final Lineage2Connection conn) {
-		conn.write(new ManorListPacket("gludio", "dion", "giran", "oren", "aden",
-				"innadril", "goddard", "rune", "schuttgart"));
+		conn.write(new ManorListPacket("gludio", "dion", "giran", "oren",
+				"aden", "innadril", "goddard", "rune", "schuttgart"));
 	}
 }
diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterEnterWorldPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/CharacterEnterWorldPacket.java
index a5569c9b2..5139e7467 100644
--- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterEnterWorldPacket.java
+++ b/src/main/java/com/l2jserver/game/net/packet/server/CharacterEnterWorldPacket.java
@@ -51,7 +51,7 @@ public class CharacterEnterWorldPacket extends AbstractServerPacket {
 		buffer.writeInt(character.getAttributes().getStrength()); // STR
 		buffer.writeInt(character.getAttributes().getConcentration()); // CON
 		buffer.writeInt(character.getAttributes().getMentality()); // MEN
-		buffer.writeInt(character.getAttributes().getDextry()); // DEX
+		buffer.writeInt(character.getAttributes().getDexterity()); // DEX
 		buffer.writeInt(character.getAttributes().getWitness()); // WIT
 
 		buffer.writeInt(250); // game time
diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java
index d5b847d0c..037c63626 100644
--- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java
+++ b/src/main/java/com/l2jserver/game/net/packet/server/CharacterSelectionListPacket.java
@@ -47,7 +47,7 @@ public class CharacterSelectionListPacket extends AbstractServerPacket {
 		buffer.writeInt(0x07); // max chars
 		buffer.writeByte(0x00);
 
-		//int i = 0;
+		// int i = 0;
 		for (final L2Character character : characters) {
 			BufferUtils.writeString(buffer, character.getName());
 			buffer.writeInt(character.getID().getID());
@@ -128,13 +128,13 @@ public class CharacterSelectionListPacket extends AbstractServerPacket {
 			// buffer.writeInt(charInfoPackage.getPaperdollItemId(Inventory.PAPERDOLL_BELT));
 
 			// hair style
-			//buffer.writeInt(character.getAppearance().getHairStyle().option);
+			// buffer.writeInt(character.getAppearance().getHairStyle().option);
 			buffer.writeInt(0x02);
 			// hair color
-			//buffer.writeInt(character.getAppearance().getHairColor().option);
+			// buffer.writeInt(character.getAppearance().getHairColor().option);
 			buffer.writeInt(0x03);
 			// face
-			//buffer.writeInt(character.getAppearance().getFace().option);
+			// buffer.writeInt(character.getAppearance().getFace().option);
 			buffer.writeInt(0x00);
 
 			buffer.writeDouble(30); // hp max
@@ -164,7 +164,7 @@ public class CharacterSelectionListPacket extends AbstractServerPacket {
 
 			// buffer.writeInt(0x00);
 
-			//i++;
+			// i++;
 		}
 	}
 }
diff --git a/src/main/java/com/l2jserver/game/net/packet/server/CharacterTemplatePacket.java b/src/main/java/com/l2jserver/game/net/packet/server/CharacterTemplatePacket.java
index f2d26f266..1c075fcd2 100644
--- a/src/main/java/com/l2jserver/game/net/packet/server/CharacterTemplatePacket.java
+++ b/src/main/java/com/l2jserver/game/net/packet/server/CharacterTemplatePacket.java
@@ -30,7 +30,7 @@ public class CharacterTemplatePacket extends AbstractServerPacket {
 			buffer.writeInt(template.getBaseAttributes().getStrength());
 			buffer.writeInt(0x0a);
 			buffer.writeInt(0x46);
-			buffer.writeInt(template.getBaseAttributes().getDextry());
+			buffer.writeInt(template.getBaseAttributes().getDexterity());
 			buffer.writeInt(0x0a);
 			buffer.writeInt(0x46);
 			buffer.writeInt(template.getBaseAttributes().getConcentration());
diff --git a/src/main/java/com/l2jserver/game/net/packet/server/UserinfoPacket.java b/src/main/java/com/l2jserver/game/net/packet/server/UserInformationPacket.java
similarity index 85%
rename from src/main/java/com/l2jserver/game/net/packet/server/UserinfoPacket.java
rename to src/main/java/com/l2jserver/game/net/packet/server/UserInformationPacket.java
index afebcfd0c..d8b5ebf83 100644
--- a/src/main/java/com/l2jserver/game/net/packet/server/UserinfoPacket.java
+++ b/src/main/java/com/l2jserver/game/net/packet/server/UserInformationPacket.java
@@ -10,7 +10,7 @@ import com.l2jserver.util.BufferUtils;
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */
-public class UserinfoPacket extends AbstractServerPacket {
+public class UserInformationPacket extends AbstractServerPacket {
 	/**
 	 * Message OPCODE
 	 */
@@ -18,7 +18,7 @@ public class UserinfoPacket extends AbstractServerPacket {
 
 	private String[] manors;
 
-	public UserinfoPacket(String... manors) {
+	public UserInformationPacket(String... manors) {
 		super(OPCODE);
 		this.manors = manors;
 	}
diff --git a/src/main/java/com/l2jserver/model/template/CharacterTemplate.java b/src/main/java/com/l2jserver/model/template/CharacterTemplate.java
index a5c631b64..b74629e3c 100644
--- a/src/main/java/com/l2jserver/model/template/CharacterTemplate.java
+++ b/src/main/java/com/l2jserver/model/template/CharacterTemplate.java
@@ -36,7 +36,7 @@ public abstract class CharacterTemplate extends AbstractTemplate<L2Character> {
 
 	public CharacterTemplate(CharacterTemplateID id,
 			CharacterClass characterClass, int intelligence, int strength,
-			int concentration, int mentality, int dextry, int witness,
+			int concentration, int mentality, int dexterity, int witness,
 			int physicalAttack, int magicalAttack, int physicalDefense,
 			int magicalDefense, int attackSpeed, int castSpeed, int accuracy,
 			int criticalChance, int evasionChance, int moveSpeed,
@@ -46,7 +46,7 @@ public abstract class CharacterTemplate extends AbstractTemplate<L2Character> {
 		this.characterClass = characterClass;
 		this.spawnLocation = spawnLocation;
 		baseAttributes = new CharacterBaseAttributes(intelligence, strength,
-				concentration, mentality, dextry, witness, physicalAttack,
+				concentration, mentality, dexterity, witness, physicalAttack,
 				magicalAttack, physicalDefense, magicalDefense, attackSpeed,
 				castSpeed, accuracy, criticalChance, evasionChance, moveSpeed,
 				maxWeigth, craft);
@@ -133,10 +133,10 @@ public abstract class CharacterTemplate extends AbstractTemplate<L2Character> {
 
 	/**
 	 * @return
-	 * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getDextry()
+	 * @see com.l2jserver.model.world.character.CharacterBaseAttributes#getDexterity()
 	 */
 	public int getDextry() {
-		return baseAttributes.getDextry();
+		return baseAttributes.getDexterity();
 	}
 
 	/**
diff --git a/src/main/java/com/l2jserver/model/world/character/CharacterAttributes.java b/src/main/java/com/l2jserver/model/world/character/CharacterAttributes.java
index dc76a85a3..1508f692d 100644
--- a/src/main/java/com/l2jserver/model/world/character/CharacterAttributes.java
+++ b/src/main/java/com/l2jserver/model/world/character/CharacterAttributes.java
@@ -22,9 +22,9 @@ public interface CharacterAttributes {
 	public int getMentality();
 
 	/**
-	 * @return the dextry
+	 * @return the dexterity
 	 */
-	public int getDextry();
+	public int getDexterity();
 
 	/**
 	 * @return the witness
diff --git a/src/main/java/com/l2jserver/model/world/character/CharacterBaseAttributes.java b/src/main/java/com/l2jserver/model/world/character/CharacterBaseAttributes.java
index d0b18ea2b..c53b62d6b 100644
--- a/src/main/java/com/l2jserver/model/world/character/CharacterBaseAttributes.java
+++ b/src/main/java/com/l2jserver/model/world/character/CharacterBaseAttributes.java
@@ -25,7 +25,7 @@ public class CharacterBaseAttributes implements CharacterAttributes {
 	/**
 	 * The character dextry
 	 */
-	private final int dextry;
+	private final int dexterity;
 	/**
 	 * The character witness
 	 */
@@ -132,7 +132,7 @@ public class CharacterBaseAttributes implements CharacterAttributes {
 		this.strength = strength;
 		this.concentration = concentration;
 		this.mentality = mentality;
-		this.dextry = dextry;
+		this.dexterity = dextry;
 		this.witness = witness;
 		this.physicalAttack = physicalAttack;
 		this.magicalAttack = magicalAttack;
@@ -179,8 +179,8 @@ public class CharacterBaseAttributes implements CharacterAttributes {
 	/**
 	 * @return the dextry
 	 */
-	public int getDextry() {
-		return dextry;
+	public int getDexterity() {
+		return dexterity;
 	}
 
 	/**
diff --git a/src/main/java/com/l2jserver/model/world/character/CharacterCalculatedAttributes.java b/src/main/java/com/l2jserver/model/world/character/CharacterCalculatedAttributes.java
index 848679189..451ad1fe3 100644
--- a/src/main/java/com/l2jserver/model/world/character/CharacterCalculatedAttributes.java
+++ b/src/main/java/com/l2jserver/model/world/character/CharacterCalculatedAttributes.java
@@ -27,8 +27,8 @@ public class CharacterCalculatedAttributes implements CharacterAttributes {
 		return baseAttributes.getMentality();
 	}
 
-	public int getDextry() {
-		return baseAttributes.getDextry();
+	public int getDexterity() {
+		return baseAttributes.getDexterity();
 	}
 
 	public int getWitness() {
diff --git a/src/main/java/com/l2jserver/util/RGBColor.java b/src/main/java/com/l2jserver/util/RGBColor.java
index 464f83d4b..3b070329b 100644
--- a/src/main/java/com/l2jserver/util/RGBColor.java
+++ b/src/main/java/com/l2jserver/util/RGBColor.java
@@ -35,9 +35,9 @@ public class RGBColor {
 	public byte[] toByteArray() {
 		return new byte[] { red, green, blue };
 	}
-	
+
 	public int toInteger() {
-		return red  + green >> 8 + blue >> 16;
+		return red + green >> 8 + blue >> 16;
 	}
 
 	public static RGBColor fromByteArray(byte[] rgb) {