diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 389710eb6..0bdb3a0c2 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -1003,7 +1003,7 @@ int gdb_set_registers_packet(struct connection *connection, target_t *target, ch
 			LOG_ERROR("BUG: register packet is too small for registers");
 		}
 
-		reg_arch_type_t *arch_type;
+		struct reg_arch_type *arch_type;
 		bin_buf = malloc(CEIL(reg_list[i]->size, 8));
 		gdb_target_to_reg(target, packet_p, chars, bin_buf);
 
@@ -1070,7 +1070,7 @@ int gdb_set_register_packet(struct connection *connection, target_t *target, cha
 	reg_t **reg_list;
 	int reg_list_size;
 	int retval;
-	reg_arch_type_t *arch_type;
+	struct reg_arch_type *arch_type;
 
 	LOG_DEBUG("-");
 
diff --git a/src/target/register.c b/src/target/register.c
index 2efcd5f8b..c3ad830a5 100644
--- a/src/target/register.c
+++ b/src/target/register.c
@@ -28,7 +28,7 @@
 #include "log.h"
 
 
-reg_arch_type_t *reg_arch_types = NULL;
+struct reg_arch_type *reg_arch_types = NULL;
 
 reg_t* register_get_by_name(struct reg_cache *first,
 		const char *name, bool search_all)
@@ -68,7 +68,7 @@ struct reg_cache** register_get_last_cache_p(struct reg_cache **first)
 
 int register_reg_arch_type(int (*get)(reg_t *reg), int (*set)(reg_t *reg, uint8_t *buf))
 {
-	reg_arch_type_t** arch_type_p = &reg_arch_types;
+	struct reg_arch_type** arch_type_p = &reg_arch_types;
 	int id = 0;
 
 	if (*arch_type_p)
@@ -80,7 +80,7 @@ int register_reg_arch_type(int (*get)(reg_t *reg), int (*set)(reg_t *reg, uint8_
 		}
 	}
 
-	(*arch_type_p) = malloc(sizeof(reg_arch_type_t));
+	(*arch_type_p) = malloc(sizeof(struct reg_arch_type));
 	(*arch_type_p)->id = id + 1;
 	(*arch_type_p)->set = set;
 	(*arch_type_p)->get = get;
@@ -89,9 +89,9 @@ int register_reg_arch_type(int (*get)(reg_t *reg), int (*set)(reg_t *reg, uint8_
 	return id + 1;
 }
 
-reg_arch_type_t* register_get_arch_type(int id)
+struct reg_arch_type* register_get_arch_type(int id)
 {
-	reg_arch_type_t *arch_type = reg_arch_types;
+	struct reg_arch_type *arch_type = reg_arch_types;
 
 	while (arch_type)
 	{
diff --git a/src/target/register.h b/src/target/register.h
index 422fbd293..57342ba39 100644
--- a/src/target/register.h
+++ b/src/target/register.h
@@ -54,13 +54,13 @@ struct reg_cache
 	int num_regs;
 };
 
-typedef struct reg_arch_type_s
+struct reg_arch_type
 {
 	int id;
 	int (*get)(reg_t *reg);
 	int (*set)(reg_t *reg, uint8_t *buf);
-	struct reg_arch_type_s *next;
-} reg_arch_type_t;
+	struct reg_arch_type *next;
+};
 
 reg_t* register_get_by_name(struct reg_cache *first,
 		const char *name, bool search_all);
@@ -68,7 +68,7 @@ struct reg_cache** register_get_last_cache_p(struct reg_cache **first);
 
 int register_reg_arch_type(int (*get)(reg_t *reg),
 		int (*set)(reg_t *reg, uint8_t *buf));
-reg_arch_type_t* register_get_arch_type(int id);
+struct reg_arch_type* register_get_arch_type(int id);
 
 void register_init_dummy(reg_t *reg);
 
diff --git a/src/target/target.c b/src/target/target.c
index eaa29db11..8932266ab 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -1961,7 +1961,7 @@ COMMAND_HANDLER(handle_reg_command)
 
 		if (reg->valid == 0)
 		{
-			reg_arch_type_t *arch_type = register_get_arch_type(reg->arch_type);
+			struct reg_arch_type *arch_type = register_get_arch_type(reg->arch_type);
 			arch_type->get(reg);
 		}
 		value = buf_to_str(reg->value, reg->size, 16);
@@ -1976,7 +1976,7 @@ COMMAND_HANDLER(handle_reg_command)
 		uint8_t *buf = malloc(CEIL(reg->size, 8));
 		str_to_buf(args[1], strlen(args[1]), buf, reg->size, 0);
 
-		reg_arch_type_t *arch_type = register_get_arch_type(reg->arch_type);
+		struct reg_arch_type *arch_type = register_get_arch_type(reg->arch_type);
 		arch_type->set(reg, buf);
 
 		value = buf_to_str(reg->value, reg->size, 16);