diff --git a/app.rb b/app.rb
index f99fb6b..046cdac 100644
--- a/app.rb
+++ b/app.rb
@@ -168,7 +168,7 @@
     t["full_text"].grep_urls
   end.flatten.tap { |urls| URL.resolve(urls) }
 
-  erb :twitter_feed
+  erb :"twitter.atom"
 end
 
 get "/youtube" do
@@ -340,7 +340,7 @@
     video["snippet"]["description"].grep_urls
   end.flatten.tap { |urls| URL.resolve(urls) }
 
-  erb :youtube_feed
+  erb :"youtube.atom"
 end
 
 get %r{/googleplus/(?<id>\d+)/(?<username>.+)} do |id, username|
@@ -521,7 +521,7 @@
     post.slice("message", "description", "link").values.map(&:grep_urls)
   end.flatten.tap { |urls| URL.resolve(urls) }
 
-  erb :facebook_feed
+  erb :"facebook.atom"
 end
 
 get "/instagram" do
@@ -658,7 +658,7 @@
     post["node"]["edge_media_to_caption"]["edges"][0]["node"]["text"].grep_urls
   end.flatten.tap { |urls| URL.resolve(urls) }
 
-  erb :instagram_feed
+  erb :"instagram.atom"
 end
 
 get "/periscope" do
@@ -705,7 +705,7 @@
     @username
   end
 
-  erb :periscope_feed
+  erb :"periscope.atom"
 end
 
 get %r{/periscope_img/(?<broadcast_id>[^/]+)} do |id|
@@ -788,7 +788,7 @@
     track["description"]
   end.compact.map(&:grep_urls).flatten.tap { |urls| URL.resolve(urls) }
 
-  erb :soundcloud_feed
+  erb :"soundcloud.atom"
 end
 
 get "/mixcloud" do
@@ -817,7 +817,7 @@
   @username = @data[0]["user"]["username"] rescue CGI.unescape(username)
   @user = @data[0]["user"]["name"] rescue CGI.unescape(user)
 
-  erb :mixcloud_feed
+  erb :"mixcloud.atom"
 end
 
 get "/twitch" do
@@ -995,7 +995,7 @@
     video["description"]
   end.compact.map(&:grep_urls).flatten.tap { |urls| URL.resolve(urls) }
 
-  erb :twitch_feed
+  erb :"twitch.atom"
 end
 
 get %r{/twitch/(?<id>\d+)/(?<user>.+)} do |id, user|
@@ -1021,7 +1021,7 @@
     video["description"]
   end.compact.map(&:grep_urls).flatten.tap { |urls| URL.resolve(urls) }
 
-  erb :twitch_feed
+  erb :"twitch.atom"
 end
 
 get "/speedrun" do
@@ -1066,7 +1066,7 @@
     ].flatten.compact.map(&:grep_urls)
   end.flatten.tap { |urls| URL.resolve(urls) }
 
-  erb :speedrun_feed
+  erb :"speedrun.atom"
 end
 
 get "/ustream" do
@@ -1103,7 +1103,7 @@
     video["description"]
   end.compact.map(&:grep_urls).flatten.tap { |urls| URL.resolve(urls) }
 
-  erb :ustream_feed
+  erb :"ustream.atom"
 end
 
 get "/ustream/download" do
@@ -1171,7 +1171,7 @@
   raise(DailymotionError, response) if !response.success?
   @data = response.json["list"]
 
-  erb :dailymotion_feed
+  erb :"dailymotion.atom"
 end
 
 get "/imgur" do
@@ -1259,7 +1259,7 @@
     image["description"]
   end.flatten.compact.map(&:grep_urls).flatten.tap { |urls| URL.resolve(urls) }
 
-  erb :imgur_feed
+  erb :"imgur.atom"
 end
 
 get "/svtplay" do
diff --git a/views/dailymotion_feed.erb b/views/dailymotion.atom.erb
similarity index 100%
rename from views/dailymotion_feed.erb
rename to views/dailymotion.atom.erb
diff --git a/views/facebook_feed.erb b/views/facebook.atom.erb
similarity index 100%
rename from views/facebook_feed.erb
rename to views/facebook.atom.erb
diff --git a/views/imgur_feed.erb b/views/imgur.atom.erb
similarity index 100%
rename from views/imgur_feed.erb
rename to views/imgur.atom.erb
diff --git a/views/instagram_feed.erb b/views/instagram.atom.erb
similarity index 100%
rename from views/instagram_feed.erb
rename to views/instagram.atom.erb
diff --git a/views/mixcloud_feed.erb b/views/mixcloud.atom.erb
similarity index 100%
rename from views/mixcloud_feed.erb
rename to views/mixcloud.atom.erb
diff --git a/views/periscope_feed.erb b/views/periscope.atom.erb
similarity index 100%
rename from views/periscope_feed.erb
rename to views/periscope.atom.erb
diff --git a/views/soundcloud_feed.erb b/views/soundcloud.atom.erb
similarity index 100%
rename from views/soundcloud_feed.erb
rename to views/soundcloud.atom.erb
diff --git a/views/speedrun_feed.erb b/views/speedrun.atom.erb
similarity index 100%
rename from views/speedrun_feed.erb
rename to views/speedrun.atom.erb
diff --git a/views/twitch_feed.erb b/views/twitch.atom.erb
similarity index 100%
rename from views/twitch_feed.erb
rename to views/twitch.atom.erb
diff --git a/views/twitter_feed.erb b/views/twitter.atom.erb
similarity index 100%
rename from views/twitter_feed.erb
rename to views/twitter.atom.erb
diff --git a/views/ustream_feed.erb b/views/ustream.atom.erb
similarity index 100%
rename from views/ustream_feed.erb
rename to views/ustream.atom.erb
diff --git a/views/youtube_feed.erb b/views/youtube.atom.erb
similarity index 100%
rename from views/youtube_feed.erb
rename to views/youtube.atom.erb