diff --git a/receiver/JFJochReceiver.cpp b/receiver/JFJochReceiver.cpp
index e6b29941..4cc0fd50 100644
--- a/receiver/JFJochReceiver.cpp
+++ b/receiver/JFJochReceiver.cpp
@@ -565,7 +565,7 @@ void JFJochReceiver::Cancel() {
     cancelled = true;
 
     for (int d = 0; d < ndatastreams; d++)
-        acquisition_device[d]->ActionAbort();
+        acquisition_device[d]->Cancel();
 }
 
 void JFJochReceiver::Cancel(const JFJochException &e) {
@@ -575,7 +575,7 @@ void JFJochReceiver::Cancel(const JFJochException &e) {
     cancelled = true;
 
     for (int d = 0; d < ndatastreams; d++)
-        acquisition_device[d]->ActionAbort();
+        acquisition_device[d]->Cancel();
 }
 
 float JFJochReceiver::GetIndexingRate() const {
@@ -628,7 +628,7 @@ void JFJochReceiver::FinalizeMeasurement() {
         preview_publisher_indexed->Stop(experiment);
 
     for (int d = 0; d < ndatastreams; d++)
-        acquisition_device[d]->ActionAbort();
+        acquisition_device[d]->Cancel();
 
     end_time = std::chrono::system_clock::now();
 
diff --git a/receiver/host/AcquisitionDevice.cpp b/receiver/host/AcquisitionDevice.cpp
index 9736a892..24b0c378 100644
--- a/receiver/host/AcquisitionDevice.cpp
+++ b/receiver/host/AcquisitionDevice.cpp
@@ -56,7 +56,7 @@ void AcquisitionDevice::PrepareAction(const DiffractionExperiment &experiment) {
 }
 
 void AcquisitionDevice::StartAction(const DiffractionExperiment &experiment) {
-    HW_SetCancelDataCollectionBit();
+    Cancel();
 
     if (experiment.GetModulesNum(data_stream) > max_modules)
         throw(JFJochException(JFJochExceptionCategory::InputParameterAboveMax,
@@ -76,7 +76,7 @@ void AcquisitionDevice::StartAction(const DiffractionExperiment &experiment) {
     // Ensure internal WR queue is empty
     work_request_queue.Clear();
 
-    HW_StartAction(experiment);
+    Start(experiment);
 
     for (uint32_t i = 0; i < buffer_device.size(); i++)
         SendWorkRequest(i);
@@ -106,7 +106,7 @@ void AcquisitionDevice::WaitForActionComplete() {
 
     while (c.type != Completion::Type::End) {
         if (c.frame_number >= expected_frames) {
-            HW_SetCancelDataCollectionBit();
+            Cancel();
             // this frame is not of any interest, therefore its location can be immediately released
             SendWorkRequest(c.handle);
         } else {
@@ -128,8 +128,8 @@ void AcquisitionDevice::WaitForActionComplete() {
     counters.SetAcquisitionFinished();
 
     end_time = std::chrono::system_clock::now();
-    HW_SetCancelDataCollectionBit();
-    HW_EndAction();
+    Cancel();
+    Finalize();
 }
 
 void AcquisitionDevice::SendWorkRequest(uint32_t handle) {
@@ -166,10 +166,6 @@ bool AcquisitionDevice::IsDone() const {
     return counters.IsAcquisitionFinished();
 }
 
-void AcquisitionDevice::ActionAbort() {
-    HW_SetCancelDataCollectionBit();
-}
-
 const int16_t *AcquisitionDevice::GetFrameBuffer(size_t frame_number, uint16_t module_number) const {
     auto handle = GetBufferHandle(frame_number, module_number);
     if (handle != HandleNotValid)
@@ -239,3 +235,11 @@ uint32_t AcquisitionDevice::GetExptime(size_t curr_frame, uint16_t module_number
 uint64_t AcquisitionDevice::GetTimestamp(size_t curr_frame, uint16_t module_number) const {
     return counters.GetTimestamp(curr_frame, module_number);
 }
+
+std::string AcquisitionDevice::GetIPv4Address() const {
+    return IPv4AddressToStr(ipv4_addr);
+}
+
+std::string AcquisitionDevice::GetMACAddress() const {
+    return MacAddressToStr(mac_addr);
+}
diff --git a/receiver/host/AcquisitionDevice.h b/receiver/host/AcquisitionDevice.h
index 6a1a244c..037e759a 100644
--- a/receiver/host/AcquisitionDevice.h
+++ b/receiver/host/AcquisitionDevice.h
@@ -36,9 +36,8 @@ class AcquisitionDevice {
     AcquisitionOnlineCounters counters;
     AcquisitionOfflineCounters completion_vector;
 
-    virtual void HW_StartAction(const DiffractionExperiment& experiment) = 0;
-    virtual void HW_SetCancelDataCollectionBit() = 0;
-    virtual void HW_EndAction() {}; // do clean-up after action is done
+    virtual void Start(const DiffractionExperiment& experiment) = 0;
+    virtual void Finalize() {}; // do clean-up after action is done
     virtual void StartSendingWorkRequests() {};
 protected:
     ThreadSafeFIFO<Completion> work_completion_queue;
@@ -50,6 +49,9 @@ protected:
     Logger *logger;
     uint32_t max_modules = 1;
 
+    uint64_t mac_addr;
+    uint32_t ipv4_addr;
+
     explicit AcquisitionDevice(uint16_t data_stream);
 
     void UnmapBuffers();
@@ -63,7 +65,7 @@ public:
     void PrepareAction(const DiffractionExperiment &experiment);
 
     void WaitForActionComplete();
-    void ActionAbort();
+    virtual void Cancel() = 0;
 
     void SendWorkRequest(uint32_t handle);
     void EnableLogging(Logger *logger);
@@ -97,12 +99,12 @@ public:
     bool IsFullModuleCollected(size_t frame, uint8_t module_number) const;
     bool IsDone() const;
 
-    virtual std::string GetIPv4Address() const = 0;
-    virtual std::string GetMACAddress() const = 0;
+    virtual std::string GetIPv4Address() const;
+    virtual std::string GetMACAddress() const;
     virtual uint16_t GetUDPPort() const;
     virtual int32_t GetNUMANode() const;
 
-    virtual const std::vector<uint16_t> GetInternalGeneratorFrame() const {
+    virtual std::vector<uint16_t> GetInternalGeneratorFrame() const {
         return {};
     }
 };
diff --git a/receiver/host/AcquisitionOnlineCounters.h b/receiver/host/AcquisitionOnlineCounters.h
index fd8ac11c..3c2f5374 100644
--- a/receiver/host/AcquisitionOnlineCounters.h
+++ b/receiver/host/AcquisitionOnlineCounters.h
@@ -43,13 +43,14 @@ public:
     void UpdateCounters(const Completion *c);
     void SetAcquisitionFinished();
 
+    uint64_t GetBufferHandleAndClear(size_t frame, uint16_t module_number);
+
     uint64_t GetHead(uint16_t module_number) const;
     uint64_t GetSlowestHead() const;
 
     void WaitForFrame(size_t curr_frame, uint16_t module_number = UINT16_MAX) const;
     int64_t CalculateDelay(size_t curr_frame, uint16_t module_number = UINT16_MAX) const; // mutex acquired indirectly
     uint64_t GetBufferHandle(size_t frame, uint16_t module_number) const;
-    uint64_t GetBufferHandleAndClear(size_t frame, uint16_t module_number);
     bool IsFullModuleCollected(size_t frame, uint16_t module_number) const;
     bool IsAcquisitionFinished() const;
 
diff --git a/receiver/host/FPGAAcquisitionDevice.cpp b/receiver/host/FPGAAcquisitionDevice.cpp
index 586335ce..fd586df1 100644
--- a/receiver/host/FPGAAcquisitionDevice.cpp
+++ b/receiver/host/FPGAAcquisitionDevice.cpp
@@ -10,7 +10,7 @@ void FPGAAcquisitionDevice::StartSendingWorkRequests() {
     send_work_request_future = std::async(std::launch::async, &FPGAAcquisitionDevice::SendWorkRequestThread, this);
 }
 
-void FPGAAcquisitionDevice::HW_EndAction() {
+void FPGAAcquisitionDevice::Finalize() {
     read_work_completion_future.get();
 
     stop_work_requests = true;
@@ -122,7 +122,7 @@ void FPGAAcquisitionDevice::FillActionRegister(const DiffractionExperiment& x, A
 }
 
 
-void FPGAAcquisitionDevice::HW_StartAction(const DiffractionExperiment &experiment) {
+void FPGAAcquisitionDevice::Start(const DiffractionExperiment &experiment) {
     if (!HW_IsIdle())
         throw(JFJochException(JFJochExceptionCategory::AcquisitionDeviceError,
                               "Hardware action running prior to start of data acquisition"));
@@ -244,7 +244,7 @@ void FPGAAcquisitionDevice::SetCustomInternalGeneratorFrame(const std::vector<ui
         internal_pkt_gen_frame[i] = v[i];
 }
 
-const std::vector<uint16_t> FPGAAcquisitionDevice::GetInternalGeneratorFrame() const {
+std::vector<uint16_t> FPGAAcquisitionDevice::GetInternalGeneratorFrame() const {
     return internal_pkt_gen_frame;
 }
 
diff --git a/receiver/host/FPGAAcquisitionDevice.h b/receiver/host/FPGAAcquisitionDevice.h
index 32a79951..928626a5 100644
--- a/receiver/host/FPGAAcquisitionDevice.h
+++ b/receiver/host/FPGAAcquisitionDevice.h
@@ -8,6 +8,10 @@
 #include "ActionConfig.h"
 
 class FPGAAcquisitionDevice : public AcquisitionDevice {
+    uint16_t data_collection_id = 0;
+    bool fpga_non_blocking_mode = true;
+    std::vector<uint16_t> internal_pkt_gen_frame;
+
     virtual void FPGA_StartAction() = 0;
     virtual void FPGA_EndAction() = 0;
 
@@ -16,7 +20,7 @@ class FPGAAcquisitionDevice : public AcquisitionDevice {
     virtual bool HW_IsIdle() const = 0;
     void FillActionRegister(const DiffractionExperiment& x, ActionConfig& job);
 
-    void HW_EndAction() final;
+    void Finalize() final;
 
     std::future<void> read_work_completion_future;
     void ReadWorkCompletionThread();
@@ -28,10 +32,7 @@ class FPGAAcquisitionDevice : public AcquisitionDevice {
     virtual bool HW_ReadMailbox(uint32_t values[16]) = 0;
     virtual bool HW_SendWorkRequest(uint32_t handle) = 0;
     void StartSendingWorkRequests() override;
-    void HW_StartAction(const DiffractionExperiment &experiment) override;
-    uint16_t data_collection_id = 0;
-    bool fpga_non_blocking_mode = true;
-    std::vector<uint16_t> internal_pkt_gen_frame;
+    void Start(const DiffractionExperiment &experiment) override;
 protected:
     explicit FPGAAcquisitionDevice(uint16_t data_stream);
     virtual void HW_GetStatus(ActionStatus *status) const = 0;
@@ -45,8 +46,7 @@ public:
 
     void SetFPGANonBlockingMode(bool input);
     void SetCustomInternalGeneratorFrame(const std::vector<uint16_t> &v);
-    const std::vector<uint16_t> GetInternalGeneratorFrame() const override;
+    std::vector<uint16_t> GetInternalGeneratorFrame() const override;
 };
 
-
 #endif //JUNGFRAUJOCH_FPGAACQUISITIONDEVICE_H
diff --git a/receiver/host/HLSSimulatedDevice.cpp b/receiver/host/HLSSimulatedDevice.cpp
index e3bae085..53e2bdc1 100644
--- a/receiver/host/HLSSimulatedDevice.cpp
+++ b/receiver/host/HLSSimulatedDevice.cpp
@@ -6,7 +6,6 @@
 #include <bitset>
 #include <arpa/inet.h>
 #include "datamover_model.h"
-#include "../common/NetworkAddressConvert.h"
 
 uint16_t checksum(const uint16_t *addr, size_t count) {
 /* Compute Internet Checksum for "count" bytes
@@ -33,6 +32,8 @@ HLSSimulatedDevice::HLSSimulatedDevice(uint16_t data_stream, size_t in_frame_buf
           datamover_in(Direction::Input),
           datamover_out(Direction::Output, nullptr, 256),
           idle(true) {
+    mac_addr = 0xCCAA11223344;
+    ipv4_addr = 0x0132010A;
 
     max_modules = MAX_MODULES_FPGA;
 
@@ -80,7 +81,7 @@ void HLSSimulatedDevice::CreatePacketJF(const DiffractionExperiment& experiment,
     packet->ether_type = htons(0x0800);
     packet->sour_mac[0] = 0x00; // module 0
 
-    uint64_t tmp_mac = fpga_mac_addr;
+    uint64_t tmp_mac = mac_addr;
     for (int i = 0; i < 6; i++)
         packet->dest_mac[i] = (tmp_mac >> (8*i)) % 256;
 
@@ -88,7 +89,7 @@ void HLSSimulatedDevice::CreatePacketJF(const DiffractionExperiment& experiment,
 
     packet->ipv4_header_h = htons(0x4500); // Big endian in IP header!
     packet->ipv4_header_total_length = htons(8268); // Big endian in IP header!
-    packet->ipv4_header_dest_ip = fpga_ipv4_addr;
+    packet->ipv4_header_dest_ip = ipv4_addr;
     packet->ipv4_header_sour_ip = experiment.GetSrcIPv4Address(data_stream, half_module);
 
     packet->ipv4_header_ttl_protocol = htons(0x0011);
@@ -166,7 +167,7 @@ bool HLSSimulatedDevice::HW_ReadMailbox(uint32_t values[16]) {
     return true;
 }
 
-void HLSSimulatedDevice::HW_SetCancelDataCollectionBit() {
+void HLSSimulatedDevice::Cancel() {
     cancel_data_collection = 1;
 }
 
@@ -229,30 +230,30 @@ void HLSSimulatedDevice::HLSMainThread() {
     std::vector<ap_uint<256>> d_uram_p1(MAX_MODULES_FPGA * RAW_MODULE_SIZE / 32);
 
     while(!din_eth.empty())
-        ethernet(din_eth, ip1, arp1, fpga_mac_addr, eth_packets, clear_counters);
+        ethernet(din_eth, ip1, arp1, mac_addr, eth_packets, clear_counters);
 
     while(!ip1.empty())
-        ipv4(ip1, udp1, icmp1, fpga_ipv4_addr);
+        ipv4(ip1, udp1, icmp1, ipv4_addr);
 
     arp(arp1,
         dout_eth,
-        fpga_mac_addr,
-        fpga_ipv4_addr,
+        mac_addr,
+        ipv4_addr,
         1, run_data_collection);
 
     while (!arp1.empty()) {
         arp(arp1,
             dout_eth,
-            fpga_mac_addr,
-            fpga_ipv4_addr,
+            mac_addr,
+            ipv4_addr,
             1, run_data_collection);
     }
 
     // reset static counter
     arp(arp1,
         dout_eth,
-        fpga_mac_addr,
-        fpga_ipv4_addr,
+        mac_addr,
+        ipv4_addr,
         0, run_data_collection);
 
     while(!icmp1.empty())
@@ -360,14 +361,6 @@ void HLSSimulatedDevice::HLSMainThread() {
     idle = true;
 }
 
-std::string HLSSimulatedDevice::GetIPv4Address() const {
-    return IPv4AddressToStr(fpga_ipv4_addr);
-}
-
-std::string HLSSimulatedDevice::GetMACAddress() const {
-    return MacAddressToStr(fpga_mac_addr);
-}
-
 void HLSSimulatedDevice::HW_GetStatus(ActionStatus *status) const {
     memset(status, 0, sizeof(ActionStatus));
 
diff --git a/receiver/host/HLSSimulatedDevice.h b/receiver/host/HLSSimulatedDevice.h
index 5d84ea4a..d44b8ac7 100644
--- a/receiver/host/HLSSimulatedDevice.h
+++ b/receiver/host/HLSSimulatedDevice.h
@@ -35,8 +35,6 @@ class HLSSimulatedDevice : public FPGAAcquisitionDevice {
     volatile ap_uint<1> host_writer_idle;
 
     uint64_t in_mem_location[LOAD_CALIBRATION_BRAM_SIZE];
-    static const uint64_t fpga_mac_addr = 0xCCAA11223344;
-    static const uint32_t fpga_ipv4_addr = 0x0132010A;
 
     void HW_ReadActionRegister(ActionConfig *job) override;
     void HW_WriteActionRegister(const ActionConfig *job) override;
@@ -45,7 +43,6 @@ class HLSSimulatedDevice : public FPGAAcquisitionDevice {
     void FPGA_EndAction() override;
     bool HW_IsIdle() const override;
     bool HW_ReadMailbox(uint32_t values[16]);
-    void HW_SetCancelDataCollectionBit() override;
     bool HW_SendWorkRequest(uint32_t handle) override;
     void HW_GetStatus(ActionStatus *status) const override;
     void HLSMainThread() ;
@@ -61,9 +58,7 @@ public:
                        uint8_t user = 0);
     void CreateFinalPacket(const DiffractionExperiment& experiment);
     AXI_STREAM &OutputStream();
-
-    std::string GetMACAddress() const override;
-    std::string GetIPv4Address() const override;
+    void Cancel() override;
 };
 
 
diff --git a/receiver/host/LinuxSocketDevice.cpp b/receiver/host/LinuxSocketDevice.cpp
index bfac2a84..db9dbfb6 100644
--- a/receiver/host/LinuxSocketDevice.cpp
+++ b/receiver/host/LinuxSocketDevice.cpp
@@ -14,8 +14,9 @@
 LinuxSocketDevice::LinuxSocketDevice(uint32_t in_ipv4_addr, uint16_t in_udp_port,
                                      uint16_t data_stream, size_t in_frame_buffer_size_modules,
                                      int32_t in_rcv_buf_size, int16_t in_numa_node) :
-        AcquisitionDevice(data_stream), ipv4_addr(in_ipv4_addr), udp_port(in_udp_port),
+        AcquisitionDevice(data_stream), udp_port(in_udp_port),
         numa_node(in_numa_node), rcv_buf_size(in_rcv_buf_size) {
+    ipv4_addr = in_ipv4_addr;
     max_modules = 16;
     MapBuffersStandard(in_frame_buffer_size_modules, 1, numa_node);
     mac_addr = 0;
@@ -56,7 +57,7 @@ void LinuxSocketDevice::MeasureThread(int fd) {
     idle = true;
 }
 
-void LinuxSocketDevice::HW_StartAction(const DiffractionExperiment& experiment) {
+void LinuxSocketDevice::Start(const DiffractionExperiment& experiment) {
     if (experiment.GetConversionOnFPGA())
         throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
                               "Conversion on CPU flag has to be enabled for Raw Ethernet device");
@@ -92,19 +93,11 @@ void LinuxSocketDevice::HW_StartAction(const DiffractionExperiment& experiment)
     measure = std::async(std::launch::async, &LinuxSocketDevice::MeasureThread, this, fd);
 }
 
-void LinuxSocketDevice::HW_SetCancelDataCollectionBit() {
+void LinuxSocketDevice::Cancel() {
     cancel = true;
 }
 
-std::string LinuxSocketDevice::GetMACAddress() const {
-    return MacAddressToStr(mac_addr);
-}
-
-std::string LinuxSocketDevice::GetIPv4Address() const {
-    return IPv4AddressToStr(ipv4_addr);
-}
-
-void LinuxSocketDevice::HW_EndAction() {
+void LinuxSocketDevice::Finalize() {
     if (measure.valid())
         measure.get();
 }
diff --git a/receiver/host/LinuxSocketDevice.h b/receiver/host/LinuxSocketDevice.h
index 37b35d3e..5a356944 100644
--- a/receiver/host/LinuxSocketDevice.h
+++ b/receiver/host/LinuxSocketDevice.h
@@ -10,9 +10,6 @@
 
 class LinuxSocketDevice : public AcquisitionDevice {
     int32_t rcv_buf_size;
-
-    uint64_t mac_addr;
-    uint32_t ipv4_addr;
     uint16_t udp_port;
     const int16_t numa_node;
 
@@ -21,11 +18,9 @@ class LinuxSocketDevice : public AcquisitionDevice {
     volatile bool cancel = false;
     volatile bool idle = true;
 
-    void HW_StartAction(const DiffractionExperiment& experiment) override;
+    void Start(const DiffractionExperiment& experiment) override;
 
-    void HW_SetCancelDataCollectionBit() override;
-
-    void HW_EndAction() override;
+    void Finalize() override;
     void MeasureThread(int fd);
     void FindMACAddress();
 public:
@@ -36,9 +31,7 @@ public:
 
     int32_t GetNUMANode() const override;
     uint16_t GetUDPPort() const override;
-    std::string GetMACAddress() const override;
-    std::string GetIPv4Address() const override;
+    void Cancel() override;
 };
 
-
 #endif //JUNGFRAUJOCH_LINUXSOCKETDEVICE_H
diff --git a/receiver/host/MlxRawEthDevice.cpp b/receiver/host/MlxRawEthDevice.cpp
index 616429a2..8984fced 100644
--- a/receiver/host/MlxRawEthDevice.cpp
+++ b/receiver/host/MlxRawEthDevice.cpp
@@ -78,7 +78,7 @@ void MlxRawEthDevice::MeasureThread() {
     idle = true;
 }
 
-void MlxRawEthDevice::HW_StartAction(const DiffractionExperiment& experiment) {
+void MlxRawEthDevice::Start(const DiffractionExperiment& experiment) {
     if (experiment.GetConversionOnFPGA())
         throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
                               "Conversion on CPU flag has to be enabled for Raw Ethernet device");
@@ -88,11 +88,11 @@ void MlxRawEthDevice::HW_StartAction(const DiffractionExperiment& experiment) {
     measure = std::async(std::launch::async, &MlxRawEthDevice::MeasureThread, this);
 }
 
-void MlxRawEthDevice::HW_SetCancelDataCollectionBit() {
+void MlxRawEthDevice::Cancel() {
     cancel = true;
 }
 
-void MlxRawEthDevice::HW_EndAction() {
+void MlxRawEthDevice::Finalize() {
     if (measure.valid())
         measure.get();
 }
@@ -105,14 +105,6 @@ void MlxRawEthDevice::SetIPv4Address(uint32_t ipv4_addr_network_order) {
     ipv4_addr = ipv4_addr_network_order;
 }
 
-std::string MlxRawEthDevice::GetMACAddress() const {
-    return MacAddressToStr(mac_addr);
-}
-
-std::string MlxRawEthDevice::GetIPv4Address() const {
-    return IPv4AddressToStr(ipv4_addr);
-}
-
 uint64_t MlxRawEthDevice::PollCQ(IBRegBuffer &buffer, IBQueuePair &qp, IBCompletionQueue &cq, ProcessJFPacket &process) {
 #ifdef JFJOCH_USE_NUMA
     if (numa_available() != -1)
diff --git a/receiver/host/MlxRawEthDevice.h b/receiver/host/MlxRawEthDevice.h
index b3eb79d4..3376ce5d 100644
--- a/receiver/host/MlxRawEthDevice.h
+++ b/receiver/host/MlxRawEthDevice.h
@@ -19,8 +19,6 @@ class MlxRawEthDevice : public AcquisitionDevice {
 
     std::mutex m;
     IBContext context;
-    uint64_t mac_addr;
-    uint32_t ipv4_addr;
 
     const int16_t numa_node;
 
@@ -37,9 +35,8 @@ class MlxRawEthDevice : public AcquisitionDevice {
                     ProcessJFPacket &process);
 
     void MeasureThread();
-    void HW_StartAction(const DiffractionExperiment& experiment) override;
-    void HW_SetCancelDataCollectionBit() override;
-    void HW_EndAction() override;
+    void Start(const DiffractionExperiment& experiment) override;
+    void Finalize() override;
 public:
     MlxRawEthDevice(uint16_t dev_id, uint16_t data_stream, size_t in_frame_buffer_size_modules,
                     int16_t numa_node = -1);
@@ -47,8 +44,7 @@ public:
     int32_t GetNUMANode() const override;
     void SetMACAddress(uint64_t mac_addr_network_order);
     void SetIPv4Address(uint32_t ipv4_addr_network_order);
-    std::string GetMACAddress() const override;
-    std::string GetIPv4Address() const override;
+    void Cancel() override;
 };
 
 #endif //JUNGFRAUJOCH_RAWETHDEVICE_H
diff --git a/receiver/host/MockAcquisitionDevice.cpp b/receiver/host/MockAcquisitionDevice.cpp
index 09bc9483..6017838a 100644
--- a/receiver/host/MockAcquisitionDevice.cpp
+++ b/receiver/host/MockAcquisitionDevice.cpp
@@ -5,11 +5,11 @@
 #include "../../common/JFJochException.h"
 #include <bitset>
 
-void MockAcquisitionDevice::HW_StartAction(const DiffractionExperiment& experiment) {
+void MockAcquisitionDevice::Start(const DiffractionExperiment& experiment) {
     idle = false;
 }
 
-void MockAcquisitionDevice::HW_SetCancelDataCollectionBit() {
+void MockAcquisitionDevice::Cancel() {
     if (!idle) {
         if (logger)
             logger->Info("MockAcquisitionDevice cancelling " + std::to_string(data_stream));
diff --git a/receiver/host/MockAcquisitionDevice.h b/receiver/host/MockAcquisitionDevice.h
index 1274c78e..821b5e7c 100644
--- a/receiver/host/MockAcquisitionDevice.h
+++ b/receiver/host/MockAcquisitionDevice.h
@@ -14,15 +14,14 @@ class MockAcquisitionDevice : public AcquisitionDevice {
     bool idle = true;
 
     void SendCompletion(uint32_t handle, uint16_t module_number, uint64_t frame_number);
-    void HW_StartAction(const DiffractionExperiment& experiment) override;
-
-    void HW_SetCancelDataCollectionBit() override;
+    void Start(const DiffractionExperiment& experiment) override;
 public:
     MockAcquisitionDevice(uint16_t data_stream, size_t in_frame_buffer_size_modules);
     void AddModule(uint64_t frame, uint16_t module_number, const uint16_t *data);
     void Terminate();
     std::string GetMACAddress() const override;
     std::string GetIPv4Address() const override;
+    void Cancel() override;
 };
 
 #endif //JUNGFRAUJOCH_MOCKACQUISITIONDEVICE_H
diff --git a/receiver/host/PCIExpressDevice.cpp b/receiver/host/PCIExpressDevice.cpp
index 1fb53d93..8c77924a 100644
--- a/receiver/host/PCIExpressDevice.cpp
+++ b/receiver/host/PCIExpressDevice.cpp
@@ -76,7 +76,7 @@ bool PCIExpressDevice::HW_ReadMailbox(uint32_t *values) {
 
 }
 
-void PCIExpressDevice::HW_SetCancelDataCollectionBit() {
+void PCIExpressDevice::Cancel() {
     if (ioctl(fd, IOCTL_JFJOCH_CANCEL) != 0)
         throw JFJochException(JFJochExceptionCategory::PCIeError,
                               "Failed setting cancel bit", errno);
diff --git a/receiver/host/PCIExpressDevice.h b/receiver/host/PCIExpressDevice.h
index 3df37380..42a1386f 100644
--- a/receiver/host/PCIExpressDevice.h
+++ b/receiver/host/PCIExpressDevice.h
@@ -27,7 +27,7 @@ public:
     PCIExpressDevice(const std::string &device_name, uint16_t data_stream);
     ~PCIExpressDevice() override;
 
-    void HW_SetCancelDataCollectionBit() override;
+    void Cancel() override;
     void HW_GetStatus(ActionStatus *status) const override;
     void HW_GetEnvParams(ActionEnvParams *status) const override;
     uint32_t GetNumKernelBuffers() const;
diff --git a/receiver/host/jfjoch_pcie_cancel_data_collection.cpp b/receiver/host/jfjoch_pcie_cancel_data_collection.cpp
index 555994b4..3d2e1a3c 100644
--- a/receiver/host/jfjoch_pcie_cancel_data_collection.cpp
+++ b/receiver/host/jfjoch_pcie_cancel_data_collection.cpp
@@ -18,7 +18,7 @@ int main(int argc, char **argv) {
     std::cout << std::endl;
     try {
         PCIExpressDevice test(argv[1], 0);
-        test.HW_SetCancelDataCollectionBit();
+        test.Cancel();
         logger.Info("Done");
     } catch (const JFJochException &e) {
         logger.ErrorException(e);
diff --git a/tests/FPGAIntegrationTest.cpp b/tests/FPGAIntegrationTest.cpp
index 99e3ee84..03ab39f9 100644
--- a/tests/FPGAIntegrationTest.cpp
+++ b/tests/FPGAIntegrationTest.cpp
@@ -158,7 +158,7 @@ TEST_CASE("HLS_C_Simulation_check_cancel", "[FPGA][Full]") {
     HLSSimulatedDevice test(0, 64);
 
     REQUIRE_NOTHROW(test.StartAction(x));
-    test.ActionAbort();
+    test.Cancel();
 
     REQUIRE_NOTHROW(test.WaitForActionComplete());
 
@@ -183,7 +183,7 @@ TEST_CASE("HLS_C_Simulation_check_cancel_conversion", "[FPGA][Full]") {
     HLSSimulatedDevice test(0, 64);
 
     REQUIRE_NOTHROW(test.StartAction(x));
-    test.ActionAbort();
+    test.Cancel();
 
     REQUIRE_NOTHROW(test.WaitForActionComplete());