diff --git a/fpga/include/villas/fpga/core.hpp b/fpga/include/villas/fpga/core.hpp
index 65dd1d1a3..7d193c38f 100644
--- a/fpga/include/villas/fpga/core.hpp
+++ b/fpga/include/villas/fpga/core.hpp
@@ -26,7 +26,7 @@ namespace villas {
 namespace fpga {
 
 // Forward declarations
-class PCIeCard;
+class Card;
 
 namespace ip {
 
@@ -242,7 +242,7 @@ protected:
 	Logger logger;
 
 	// FPGA card this IP is instantiated on (populated by FpgaIpFactory)
-	PCIeCard* card;
+	Card* card;
 
 	// Identifier of this IP with its instance name and VLNV
 	IpIdentifier id;
@@ -266,7 +266,7 @@ public:
 
 	// Returns a running and checked FPGA IP
 	static
-	std::list<std::shared_ptr<Core>> make(PCIeCard* card, json_t *json_ips);
+	std::list<std::shared_ptr<Core>> make(Card* card, json_t *json_ips);
 
 	virtual
 	std::string getType() const
diff --git a/fpga/lib/core.cpp b/fpga/lib/core.cpp
index 8549153a4..11e71aa3e 100644
--- a/fpga/lib/core.cpp
+++ b/fpga/lib/core.cpp
@@ -35,7 +35,7 @@ vlnvInitializationOrder = {
     Vlnv("xilinx.com:ip:axis_switch:"),
 };
 
-std::list<std::shared_ptr<Core>> CoreFactory::make(PCIeCard* card, json_t *json_ips)
+std::list<std::shared_ptr<Core>> CoreFactory::make(Card* card, json_t *json_ips)
 {
 	// We only have this logger until we know the factory to build an IP with
 	auto loggerStatic = getStaticLogger();