diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java
index cee0af5..659738e 100644
--- a/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java
+++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/activities/MainActivity.java
@@ -43,10 +43,8 @@ import org.communiquons.android.comunic.client.ui.fragments.UserPageFragment;
  *
  * @author Pierre HUBERT
  */
-public class MainActivity extends AppCompatActivity
-        implements openConversationListener,
-        updateConversationListener,
-        onOpenUsersPageListener {
+public class MainActivity extends AppCompatActivity implements openConversationListener,
+        updateConversationListener, onOpenUsersPageListener {
 
     /**
      * Debug tag
diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/CommentsAdapter.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/CommentsAdapter.java
index 046b251..c992a77 100644
--- a/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/CommentsAdapter.java
+++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/CommentsAdapter.java
@@ -13,7 +13,7 @@ import org.communiquons.android.comunic.client.R;
 import org.communiquons.android.comunic.client.data.helpers.ImageLoadHelper;
 import org.communiquons.android.comunic.client.data.models.UserInfo;
 import org.communiquons.android.comunic.client.data.models.Comment;
-import org.communiquons.android.comunic.client.ui.listeners.onPostUpdate;
+import org.communiquons.android.comunic.client.ui.listeners.onPostUpdateListener;
 import org.communiquons.android.comunic.client.ui.utils.UiUtils;
 import org.communiquons.android.comunic.client.ui.views.LikeButtonView;
 
@@ -49,7 +49,7 @@ class CommentsAdapter extends ArrayAdapter<Comment> {
      * @return Generated view
      */
     static View getInflatedView(Context context, Comment comment,
-                                onPostUpdate listener,
+                                onPostUpdateListener listener,
                                 @Nullable UserInfo user, ViewGroup viewGroup){
 
         //Inflate a view
@@ -71,7 +71,7 @@ class CommentsAdapter extends ArrayAdapter<Comment> {
      * @return Updated view
      */
     private static View fillView(final Context context, final View view, final Comment comment,
-                                 @Nullable UserInfo user, final onPostUpdate listener) {
+                                 @Nullable UserInfo user, final onPostUpdateListener listener) {
 
         //Update user name and account image
         ImageView accountImage = view.findViewById(R.id.user_account_image);
diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/PostsAdapter.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/PostsAdapter.java
index 67fffcf..c0ffb2e 100644
--- a/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/PostsAdapter.java
+++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/adapters/PostsAdapter.java
@@ -19,7 +19,7 @@ import org.communiquons.android.comunic.client.data.models.Comment;
 import org.communiquons.android.comunic.client.data.models.Post;
 import org.communiquons.android.comunic.client.data.enums.PostTypes;
 import org.communiquons.android.comunic.client.data.arrays.PostsList;
-import org.communiquons.android.comunic.client.ui.listeners.onPostUpdate;
+import org.communiquons.android.comunic.client.ui.listeners.onPostUpdateListener;
 import org.communiquons.android.comunic.client.ui.utils.UiUtils;
 import org.communiquons.android.comunic.client.data.utils.Utilities;
 import org.communiquons.android.comunic.client.ui.views.EditCommentContentView;
@@ -54,7 +54,7 @@ public class PostsAdapter extends ArrayAdapter<Post>{
     /**
      * Actions update listener
      */
-    private onPostUpdate mListener;
+    private onPostUpdateListener mListener;
 
     /**
      * Create the Post Adapter
@@ -66,7 +66,7 @@ public class PostsAdapter extends ArrayAdapter<Post>{
      *                 for example
      */
     public PostsAdapter(Context context, PostsList list, ArrayMap<Integer, UserInfo> usersInfos,
-                        onPostUpdate listener){
+                        onPostUpdateListener listener){
         super(context, 0, list);
 
         //Save the users info object
diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/PostsListFragment.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/PostsListFragment.java
index 84a54fc..ffaf468 100644
--- a/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/PostsListFragment.java
+++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/fragments/PostsListFragment.java
@@ -32,7 +32,7 @@ import org.communiquons.android.comunic.client.data.helpers.PostsHelper;
 import org.communiquons.android.comunic.client.data.arrays.PostsList;
 import org.communiquons.android.comunic.client.data.utils.StringsUtils;
 import org.communiquons.android.comunic.client.ui.adapters.PostsAdapter;
-import org.communiquons.android.comunic.client.ui.listeners.onPostUpdate;
+import org.communiquons.android.comunic.client.ui.listeners.onPostUpdateListener;
 import org.communiquons.android.comunic.client.ui.views.EditCommentContentView;
 
 import java.util.ArrayList;
@@ -47,7 +47,7 @@ import java.util.ArrayList;
  */
 
 public class PostsListFragment extends Fragment
-    implements onPostUpdate {
+    implements onPostUpdateListener {
 
     /**
      * Menu action : no action
diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/listeners/onPostUpdate.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/listeners/onPostUpdateListener.java
similarity index 98%
rename from app/src/main/java/org/communiquons/android/comunic/client/ui/listeners/onPostUpdate.java
rename to app/src/main/java/org/communiquons/android/comunic/client/ui/listeners/onPostUpdateListener.java
index 5242a9a..ae9450f 100644
--- a/app/src/main/java/org/communiquons/android/comunic/client/ui/listeners/onPostUpdate.java
+++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/listeners/onPostUpdateListener.java
@@ -12,7 +12,7 @@ import org.communiquons.android.comunic.client.ui.views.EditCommentContentView;
  *
  * @author Pierre HUBERT
  */
-public interface onPostUpdate {
+public interface onPostUpdateListener {
 
     /**
      * This method is called when a comment creation request is made