diff --git a/include/blisp.h b/include/blisp.h
index 16cd2e2..8a89ffc 100644
--- a/include/blisp.h
+++ b/include/blisp.h
@@ -31,34 +31,34 @@ struct blisp_boot_info {
 // TODO: Refactor variable names, so all will follow same semantic, like
 // image_run, image_check etc.
 
-int32_t blisp_device_init(struct blisp_device* device, struct blisp_chip* chip);
-int32_t blisp_device_open(struct blisp_device* device, const char* port_name);
-int32_t blisp_device_handshake(struct blisp_device* device, bool in_ef_loader);
-int32_t blisp_device_get_boot_info(struct blisp_device* device,
+blisp_return_t blisp_device_init(struct blisp_device* device, struct blisp_chip* chip);
+blisp_return_t blisp_device_open(struct blisp_device* device, const char* port_name);
+blisp_return_t blisp_device_handshake(struct blisp_device* device, bool in_ef_loader);
+blisp_return_t blisp_device_get_boot_info(struct blisp_device* device,
                                    struct blisp_boot_info* boot_info);
-int32_t blisp_device_load_boot_header(struct blisp_device* device,
+blisp_return_t blisp_device_load_boot_header(struct blisp_device* device,
                                       uint8_t* boot_header);
-int32_t blisp_device_load_segment_header(
+blisp_return_t blisp_device_load_segment_header(
     struct blisp_device* device,
     struct blisp_segment_header* segment_header);
-int32_t blisp_device_load_segment_data(struct blisp_device* device,
+blisp_return_t blisp_device_load_segment_data(struct blisp_device* device,
                                        uint8_t* segment_data,
                                        uint32_t segment_data_length);
-int32_t blisp_device_write_memory(struct blisp_device* device,
+blisp_return_t blisp_device_write_memory(struct blisp_device* device,
                                   uint32_t address,
                                   uint32_t value,
                                   bool wait_for_res);
-int32_t blisp_device_check_image(struct blisp_device* device);
-int32_t blisp_device_run_image(struct blisp_device* device);
-int32_t blisp_device_flash_erase(struct blisp_device* device,
+blisp_return_t blisp_device_check_image(struct blisp_device* device);
+blisp_return_t blisp_device_run_image(struct blisp_device* device);
+blisp_return_t blisp_device_flash_erase(struct blisp_device* device,
                                  uint32_t start_address,
                                  uint32_t end_address);
-int32_t blisp_device_flash_write(struct blisp_device* device,
+blisp_return_t blisp_device_flash_write(struct blisp_device* device,
                                  uint32_t start_address,
                                  uint8_t* payload,
                                  uint32_t payload_size);
-int32_t blisp_device_program_check(struct blisp_device* device);
-int32_t blisp_device_reset(struct blisp_device* device);
+blisp_return_t blisp_device_program_check(struct blisp_device* device);
+blisp_return_t blisp_device_reset(struct blisp_device* device);
 void blisp_device_close(struct blisp_device* device);
 
 #endif
\ No newline at end of file
diff --git a/tools/blisp/src/common.h b/tools/blisp/src/common.h
index e6519e7..257208e 100644
--- a/tools/blisp/src/common.h
+++ b/tools/blisp/src/common.h
@@ -6,8 +6,8 @@
 #include <blisp.h>
 #include <argtable3.h>
 
-int32_t blisp_common_prepare_flash(struct blisp_device* device);
+blisp_return_t blisp_common_prepare_flash(struct blisp_device* device);
 void blisp_common_progress_callback(uint32_t current_value, uint32_t max_value);
-int32_t blisp_common_init_device(struct blisp_device* device, struct arg_str* port_name, struct arg_str* chip_type);
+blisp_return_t blisp_common_init_device(struct blisp_device* device, struct arg_str* port_name, struct arg_str* chip_type);
 
 #endif  // BLISP_COMMON_H