diff --git a/src/main/java/com/delabassee/Countries.java b/src/main/java/com/delabassee/Country.java
similarity index 89%
rename from src/main/java/com/delabassee/Countries.java
rename to src/main/java/com/delabassee/Country.java
index 9b7535b..fc5b79b 100644
--- a/src/main/java/com/delabassee/Countries.java
+++ b/src/main/java/com/delabassee/Country.java
@@ -2,9 +2,8 @@
 
 import java.util.*;
 
-public class Countries {
+public class Country {
 
-    static class Country {
         private String iso;
         private String code;
         private String name;
@@ -30,10 +29,9 @@ public String getName() {
         public String toString() {
             return iso + " - " + code + " - " + name;
         }
-    }
 
 
-    public static String getName(String countryCode) {
+    public static String getNameByCode(String countryCode) {
 
         String[] isoCountries = Locale.getISOCountries();
         String upperCode = countryCode.toUpperCase();
@@ -48,8 +46,7 @@ public static String getName(String countryCode) {
     }
 
 
-
-    public static String getCode(String countryName) {
+    public static String getCodeByName(String countryName) {
 
         String[] isoCountries = Locale.getISOCountries();
         String upperName = countryName.toUpperCase();
@@ -64,7 +61,7 @@ public static String getCode(String countryName) {
     }
 
 
-    public static List<Country> getAllCountries() {
+    public static List<Country> getAll() {
 
         List<Country> countries = new ArrayList<Country>();
         String[] isoCountries = Locale.getISOCountries();
@@ -79,7 +76,6 @@ public static List<Country> getAllCountries() {
                 countries.add(new Country(iso, code, name));
             }
         }
-
         return countries;
 
     }