diff --git a/app/src/main/java/net/schueller/peertube/adapter/ServerListAdapter.java b/app/src/main/java/net/schueller/peertube/adapter/ServerListAdapter.java
index b5a575a..cbefba9 100644
--- a/app/src/main/java/net/schueller/peertube/adapter/ServerListAdapter.java
+++ b/app/src/main/java/net/schueller/peertube/adapter/ServerListAdapter.java
@@ -57,7 +57,7 @@ public class ServerListAdapter extends RecyclerView.Adapter<ServerListAdapter.Se
     @NonNull
     @Override
     public ServerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        View itemView = mInflater.inflate(R.layout.row_serverbook, parent, false);
+        View itemView = mInflater.inflate(R.layout.row_server_address_book, parent, false);
         return new ServerViewHolder(itemView);
     }
 
diff --git a/app/src/main/java/net/schueller/peertube/adapter/ServerSearchAdapter.java b/app/src/main/java/net/schueller/peertube/adapter/ServerSearchAdapter.java
index f605cf8..81dcab1 100644
--- a/app/src/main/java/net/schueller/peertube/adapter/ServerSearchAdapter.java
+++ b/app/src/main/java/net/schueller/peertube/adapter/ServerSearchAdapter.java
@@ -57,7 +57,7 @@ public class ServerSearchAdapter extends RecyclerView.Adapter<ServerSearchAdapte
     @Override
     public AccountViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext());
-        View view = layoutInflater.inflate(R.layout.row_server, parent, false);
+        View view = layoutInflater.inflate(R.layout.row_search_server, parent, false);
 
         baseUrl = APIUrlHelper.getUrl(activity);
 
diff --git a/app/src/main/java/net/schueller/peertube/adapter/VideoAdapter.java b/app/src/main/java/net/schueller/peertube/adapter/VideoAdapter.java
index 95c3952..42d8398 100644
--- a/app/src/main/java/net/schueller/peertube/adapter/VideoAdapter.java
+++ b/app/src/main/java/net/schueller/peertube/adapter/VideoAdapter.java
@@ -63,7 +63,7 @@ public class VideoAdapter extends RecyclerView.Adapter<VideoAdapter.VideoViewHol
     @Override
     public VideoViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext());
-        View view = layoutInflater.inflate(R.layout.row_video, parent, false);
+        View view = layoutInflater.inflate(R.layout.row_video_list, parent, false);
 
         baseUrl = APIUrlHelper.getUrl(context);
 
diff --git a/app/src/main/res/layout/content_server_address_book.xml b/app/src/main/res/layout/content_server_address_book.xml
index 3461701..cd9daa2 100644
--- a/app/src/main/res/layout/content_server_address_book.xml
+++ b/app/src/main/res/layout/content_server_address_book.xml
@@ -14,7 +14,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@android:color/darker_gray"
-        tools:listitem="@layout/row_serverbook" />
+        tools:listitem="@layout/row_server_address_book" />
 
 
 
diff --git a/app/src/main/res/layout/row_server.xml b/app/src/main/res/layout/row_search_server.xml
similarity index 100%
rename from app/src/main/res/layout/row_server.xml
rename to app/src/main/res/layout/row_search_server.xml
diff --git a/app/src/main/res/layout/row_serverbook.xml b/app/src/main/res/layout/row_server_address_book.xml
similarity index 100%
rename from app/src/main/res/layout/row_serverbook.xml
rename to app/src/main/res/layout/row_server_address_book.xml
diff --git a/app/src/main/res/layout/row_video.xml b/app/src/main/res/layout/row_video_list.xml
similarity index 100%
rename from app/src/main/res/layout/row_video.xml
rename to app/src/main/res/layout/row_video_list.xml