diff --git a/src/libavrdude-avrintel.h b/src/libavrdude-avrintel.h
index 4eee1061..6a17efd8 100644
--- a/src/libavrdude-avrintel.h
+++ b/src/libavrdude-avrintel.h
@@ -2761,7 +2761,7 @@ int upmatchingsig(uint8_t sigs[3], char *p, size_t n);
 typedef Configvalue Valueitem_t;
 typedef Configitem Configitem_t;
 typedef Register_file Register_file_t;
-typedef Avrintel uPcore_t;
+typedef Avrintel Avrintel;
 #endif
 
 #endif
diff --git a/src/urclock.c b/src/urclock.c
index 12c34086..3c6bd7ea 100644
--- a/src/urclock.c
+++ b/src/urclock.c
@@ -251,7 +251,7 @@ typedef struct {
 
   unsigned char ext_addr_byte;  // Ext-addr byte for STK500v1 protocol and MCUs with > 128k
 
-  uPcore_t uP;                  // Info about the connected processor (copied from uP_table)
+  Avrintel uP;                  // Info about the connected processor (copied from uP_table)
 
   bool initialised;             // Is this structure initialised?
   bool bleepromrw;              // Bootloader has EEPROM r/w support