diff --git a/tools/qfcc/include/expr.h b/tools/qfcc/include/expr.h
index c5c1cb960..0eeec880d 100644
--- a/tools/qfcc/include/expr.h
+++ b/tools/qfcc/include/expr.h
@@ -702,8 +702,8 @@ const expr_t *new_entity_expr (int entity_val);
 	\return			The new field constant expression node
 					(expr_t::e::field_val).
 */
-const expr_t *new_field_expr (int field_val, const type_t *type,
-							  struct def_s *def);
+const expr_t *new_deffield_expr (int field_val, const type_t *type,
+							     struct def_s *def);
 struct symbol_s *get_struct_field (const type_t *t1, const expr_t *e1,
 								   const expr_t *e2);
 
diff --git a/tools/qfcc/source/def.c b/tools/qfcc/source/def.c
index 10d248f78..e2113f335 100644
--- a/tools/qfcc/source/def.c
+++ b/tools/qfcc/source/def.c
@@ -469,7 +469,7 @@ init_vector_components (symbol_t *vector_sym, int is_field, symtab_t *symtab)
 			sym = new_symbol (name);
 		if (!expr) {
 			if (is_field) {
-				expr = new_field_expr (i, &type_float, vector_sym->def);
+				expr = new_deffield_expr (i, &type_float, vector_sym->def);
 			} else {
 				expr = field_expr (vector_expr,
 								   new_symbol_expr (new_symbol (fields[i])));
@@ -523,7 +523,7 @@ init_field_def (def_t *def, const expr_t *init, storage_class_t storage,
 		symbol_t   *field = symtab_lookup (pr.entity_fields, sym->name);
 		if (field) {
 			scoped_src_loc (init);
-			auto new = new_field_expr (0, field->type, field->def);
+			auto new = new_deffield_expr (0, field->type, field->def);
 			if (new->type != ex_value) {
 				internal_error (init, "expected value expression");
 			}
diff --git a/tools/qfcc/source/expr.c b/tools/qfcc/source/expr.c
index d2d1eef2e..a731bef02 100644
--- a/tools/qfcc/source/expr.c
+++ b/tools/qfcc/source/expr.c
@@ -833,7 +833,7 @@ new_entity_expr (int entity_val)
 }
 
 const expr_t *
-new_field_expr (int field_val, const type_t *type, def_t *def)
+new_deffield_expr (int field_val, const type_t *type, def_t *def)
 {
 	return new_value_expr (new_field_val (field_val, type, def), false);
 }
@@ -1706,7 +1706,7 @@ field_expr (const expr_t *e1, const expr_t *e2)
 		if (e2->type == ex_symbol)
 			field = get_struct_field (&type_entity, e1, e2);
 		if (field) {
-			e2 = new_field_expr (0, field->type, field->def);
+			e2 = new_deffield_expr (0, field->type, field->def);
 			e = new_binary_expr ('.', e1, e2);
 			e->expr.type = field->type;
 			return e;
@@ -1781,7 +1781,7 @@ field_expr (const expr_t *e1, const expr_t *e2)
 									e2->symbol->name);
 				}
 				def = sym->def;
-				e2 = new_field_expr (0, field->type, def);
+				e2 = new_deffield_expr (0, field->type, def);
 			} else if (e2->type != ex_value
 					   || e2->value->lltype != ev_field) {
 				internal_error (e2, "unexpected field exression");