diff --git a/src/argon2_fmt_plug.c b/src/argon2_fmt_plug.c
index b4e99dd12d..e5a771c2ae 100644
--- a/src/argon2_fmt_plug.c
+++ b/src/argon2_fmt_plug.c
@@ -153,7 +153,7 @@ static void init(struct fmt_main *self)
 	thread_mem = mem_calloc(NUM_THREADS, sizeof(struct argon2_memory));
 
 	for (i = 0; i < NUM_THREADS; i++)
-		init_region_t(&thread_mem[i].region);
+		init_region(&thread_mem[i].region);
 }
 
 static void done(void)
@@ -164,7 +164,7 @@ static void done(void)
 	MEM_FREE(crypted);
 	MEM_FREE(saved_key);
 	for (i = 0; i < NUM_THREADS; i++)
-		free_region_t(&thread_mem[i].region);
+		free_region(&thread_mem[i].region);
 	MEM_FREE(thread_mem);
 }
 
@@ -281,8 +281,8 @@ static int allocate(uint8_t **memory, size_t size)
 	}
 
 	if (thread_mem[THREAD_NUMBER].region.aligned_size < size) {
-		if (free_region_t(&thread_mem[THREAD_NUMBER].region) ||
-		    !alloc_region_t(&thread_mem[THREAD_NUMBER].region, size))
+		if (free_region(&thread_mem[THREAD_NUMBER].region) ||
+		    !alloc_region(&thread_mem[THREAD_NUMBER].region, size))
 			goto fail;
 	}
 
diff --git a/src/armory_fmt_plug.c b/src/armory_fmt_plug.c
index 0a3803be60..6ed0445b2b 100644
--- a/src/armory_fmt_plug.c
+++ b/src/armory_fmt_plug.c
@@ -115,7 +115,7 @@ static void init(struct fmt_main *self)
 	memory = mem_alloc(sizeof(*memory) * max_threads);
 	int i;
 	for (i = 0; i < max_threads; i++)
-		init_region_t(&memory[i]);
+		init_region(&memory[i]);
 
 	saved_key = mem_calloc(self->params.max_keys_per_crypt, sizeof(*saved_key));
 	crypt_out = mem_calloc(self->params.max_keys_per_crypt, sizeof(*crypt_out));
@@ -134,7 +134,7 @@ static void done(void)
 {
 	int i;
 	for (i = 0; i < max_threads; i++)
-		free_region_t(&memory[i]);
+		free_region(&memory[i]);
 	MEM_FREE(memory);
 
 	MEM_FREE(saved_key);
@@ -156,7 +156,7 @@ void reset(struct db_main *db)
 
 	int i;
 	for (i = 0; i < max_threads; i++)
-		free_region_t(&memory[i]);
+		free_region(&memory[i]);
 }
 
 static void *get_salt(char *ciphertext)
@@ -255,8 +255,8 @@ static int derive_keys(region_t *memory, int index, derived_key *dk)
 	lut_item *lut = memory->aligned;
 	size_t bytes_reqd = (size_t)n * sizeof(*lut);
 	if (!lut || memory->aligned_size < bytes_reqd) {
-		if (free_region_t(memory) ||
-		    !(lut = alloc_region_t(memory, bytes_reqd)))
+		if (free_region(memory) ||
+		    !(lut = alloc_region(memory, bytes_reqd)))
 			return -1;
 	}
 
diff --git a/src/keepass_fmt_plug.c b/src/keepass_fmt_plug.c
index 053ba06b07..6863f0552d 100644
--- a/src/keepass_fmt_plug.c
+++ b/src/keepass_fmt_plug.c
@@ -97,7 +97,7 @@ static void init(struct fmt_main *self)
 	any_cracked = 0;
 
 	for (i = 0; i < NUM_THREADS; i++)
-		init_region_t(&thread_mem[i].region);
+		init_region(&thread_mem[i].region);
 
 	Twofish_initialise();
 }
@@ -109,7 +109,7 @@ static void done(void)
 	MEM_FREE(cracked);
 	MEM_FREE(keepass_key);
 	for (i = 0; i < NUM_THREADS; i++)
-		free_region_t(&thread_mem[i].region);
+		free_region(&thread_mem[i].region);
 	MEM_FREE(thread_mem);
 }
 
@@ -125,8 +125,8 @@ static int allocate(uint8_t **memory, size_t size)
 	}
 
 	if (thread_mem[THREAD_NUMBER].region.aligned_size < size) {
-		if (free_region_t(&thread_mem[THREAD_NUMBER].region) ||
-		    !alloc_region_t(&thread_mem[THREAD_NUMBER].region, size))
+		if (free_region(&thread_mem[THREAD_NUMBER].region) ||
+		    !alloc_region(&thread_mem[THREAD_NUMBER].region, size))
 			goto fail;
 	}
 
diff --git a/src/memory.c b/src/memory.c
index dccd46fd3f..3e75d00282 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -644,7 +644,7 @@ void alter_endianity_w64(void *_x, unsigned int count) {
 #endif
 
 void *
-alloc_region_t(region_t * region, size_t size)
+alloc_region(region_t * region, size_t size)
 {
 	size_t base_size = size;
 	void * base, * aligned;
@@ -702,13 +702,13 @@ alloc_region_t(region_t * region, size_t size)
 	return aligned;
 }
 
-inline void init_region_t(region_t * region)
+inline void init_region(region_t * region)
 {
 	region->base = region->aligned = NULL;
 	region->base_size = region->aligned_size = 0;
 }
 
-int free_region_t(region_t * region)
+int free_region(region_t * region)
 {
 	if (region->base) {
 #ifdef MAP_ANON
@@ -718,6 +718,6 @@ int free_region_t(region_t * region)
 		free(region->base);
 #endif
 	}
-	init_region_t(region);
+	init_region(region);
 	return 0;
 }
diff --git a/src/memory.h b/src/memory.h
index 80a218df22..98e5595ae2 100644
--- a/src/memory.h
+++ b/src/memory.h
@@ -311,8 +311,8 @@ typedef struct {
 	size_t base_size, aligned_size;
 } region_t;
 
-extern void* alloc_region_t(region_t * region, size_t size);
-extern void init_region_t(region_t * region);
-extern int free_region_t(region_t * region);
+extern void* alloc_region(region_t * region, size_t size);
+extern void init_region(region_t * region);
+extern int free_region(region_t * region);
 
 #endif