diff --git a/fpga/src/CMakeLists.txt b/fpga/src/CMakeLists.txt
index 7b607cfd5..4acc2c54e 100644
--- a/fpga/src/CMakeLists.txt
+++ b/fpga/src/CMakeLists.txt
@@ -20,11 +20,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##############################################################################
 
-add_executable(streamer streamer.cpp)
+add_executable(villas-fpga-pipe villas-fpga-pipe.cpp)
 
-add_executable(pcimem pcimem.c)
-
-target_link_libraries(streamer PUBLIC
+target_link_libraries(villas-fpga-pipe PUBLIC
 	villas-fpga
 )
 
+add_executable(pcimem pcimem.c)
diff --git a/fpga/src/streamer.cpp b/fpga/src/villas-fpga-pipe.cpp
similarity index 99%
rename from fpga/src/streamer.cpp
rename to fpga/src/villas-fpga-pipe.cpp
index ecb2b591c..6cd60c36a 100644
--- a/fpga/src/streamer.cpp
+++ b/fpga/src/villas-fpga-pipe.cpp
@@ -147,11 +147,9 @@ int main(int argc, char* argv[])
 	}
 
 	/* Logging setup */
-
 	spdlog::set_level(spdlog::level::debug);
 	setupColorHandling();
 
-
 	fpga::PCIeCard& card = setupFpgaCard(configFile, fpgaName);
 
 	auto rtds = reinterpret_cast<fpga::ip::Rtds*>
@@ -163,7 +161,6 @@ int main(int argc, char* argv[])
 	auto fifo = reinterpret_cast<fpga::ip::Fifo*>
 	           (card.lookupIp(fpga::Vlnv("xilinx.com:ip:axi_fifo_mm_s:")));
 
-
 	if(rtds == nullptr) {
 		logger->error("No RTDS interface found on FPGA");
 		return 1;
@@ -179,7 +176,6 @@ int main(int argc, char* argv[])
 		return 1;
 	}
 
-
 	rtds->dump();
 
 	rtds->connect(rtds->getMasterPort(rtds->masterPort),