diff --git a/gyp/sources.txt b/gyp/sources.txt
index 8169d48..9183f28 100644
--- a/gyp/sources.txt
+++ b/gyp/sources.txt
@@ -100,6 +100,8 @@
 <(src_loc)/ui/focus_persister.h
 <(src_loc)/ui/inactive_press.cpp
 <(src_loc)/ui/inactive_press.h
+<(src_loc)/ui/integration.cpp
+<(src_loc)/ui/integration.h
 <(src_loc)/ui/main_queue_processor.cpp
 <(src_loc)/ui/main_queue_processor.h
 <(src_loc)/ui/painter.h
@@ -108,8 +110,6 @@
 <(src_loc)/ui/round_rect.h
 <(src_loc)/ui/rp_widget.cpp
 <(src_loc)/ui/rp_widget.h
-<(src_loc)/ui/ui_integration.cpp
-<(src_loc)/ui/ui_integration.h
 <(src_loc)/ui/ui_log.cpp
 <(src_loc)/ui/ui_log.h
 <(src_loc)/ui/ui_utility.cpp
diff --git a/ui/abstract_button.cpp b/ui/abstract_button.cpp
index 1ad9773..035e0fe 100644
--- a/ui/abstract_button.cpp
+++ b/ui/abstract_button.cpp
@@ -7,7 +7,7 @@
 #include "ui/abstract_button.h"
 
 #include "ui/ui_utility.h"
-#include "ui/ui_integration.h"
+#include "ui/integration.h"
 
 #include <QtGui/QtEvents>
 
diff --git a/ui/basic_click_handlers.cpp b/ui/basic_click_handlers.cpp
index 4d7ec60..b339ca8 100644
--- a/ui/basic_click_handlers.cpp
+++ b/ui/basic_click_handlers.cpp
@@ -8,7 +8,7 @@
 
 #include "ui/widgets/tooltip.h"
 #include "ui/text/text_entity.h"
-#include "ui/ui_integration.h"
+#include "ui/integration.h"
 #include "base/qthelp_url.h"
 
 #include <QtCore/QUrl>
diff --git a/ui/ui_integration.cpp b/ui/integration.cpp
similarity index 96%
rename from ui/ui_integration.cpp
rename to ui/integration.cpp
index 17d4473..3a29a37 100644
--- a/ui/ui_integration.cpp
+++ b/ui/integration.cpp
@@ -4,7 +4,7 @@
 // For license and copyright information please follow this link:
 // https://github.com/desktop-app/legal/blob/master/LEGAL
 //
-#include "ui/ui_integration.h"
+#include "ui/integration.h"
 
 #include "ui/text/text_entity.h"
 #include "ui/basic_click_handlers.h"
@@ -29,9 +29,9 @@ Integration &Integration::Instance() {
 void Integration::textActionsUpdated() {
 }
 
-void Integration::activationFromTopPanel() {		
+void Integration::activationFromTopPanel() {
 }
-	
+
 std::shared_ptr<ClickHandler> Integration::createLinkHandler(
 		EntityType type,
 		const QString &text,
diff --git a/ui/ui_integration.h b/ui/integration.h
similarity index 100%
rename from ui/ui_integration.h
rename to ui/integration.h
diff --git a/ui/platform/mac/ui_platform_utility_mac.mm b/ui/platform/mac/ui_platform_utility_mac.mm
index a9e206f..e4492c6 100644
--- a/ui/platform/mac/ui_platform_utility_mac.mm
+++ b/ui/platform/mac/ui_platform_utility_mac.mm
@@ -6,7 +6,7 @@
 //
 #include "ui/platform/mac/ui_platform_utility_mac.h"
 
-#include "ui/ui_integration.h"
+#include "ui/integration.h"
 
 #include <QtGui/QPainter>
 #include <QtGui/QtEvents>
diff --git a/ui/text/text.cpp b/ui/text/text.cpp
index b2e10e1..1deadf8 100644
--- a/ui/text/text.cpp
+++ b/ui/text/text.cpp
@@ -10,7 +10,7 @@
 #include "ui/text/text_block.h"
 #include "ui/text/text_isolated_emoji.h"
 #include "ui/emoji_config.h"
-#include "ui/ui_integration.h"
+#include "ui/integration.h"
 #include "base/platform/base_platform_info.h"
 
 #include <private/qfontengine_p.h>
diff --git a/ui/ui_log.cpp b/ui/ui_log.cpp
index 6982840..784b958 100644
--- a/ui/ui_log.cpp
+++ b/ui/ui_log.cpp
@@ -6,7 +6,7 @@
 //
 #include "ui/ui_log.h"
 
-#include "ui/ui_integration.h"
+#include "ui/integration.h"
 
 namespace Ui {
 
diff --git a/ui/ui_utility.h b/ui/ui_utility.h
index f0899e5..901141c 100644
--- a/ui/ui_utility.h
+++ b/ui/ui_utility.h
@@ -8,7 +8,7 @@
 
 #include "base/unique_qptr.h"
 #include "ui/rect_part.h"
-#include "ui/ui_integration.h"
+#include "ui/integration.h"
 
 #include <QtCore/QEvent>