diff --git a/src/terminal.c b/src/terminal.c
index 53b6ca8..42897bf 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -3523,9 +3523,9 @@
 	dict_T *dict = opt_item->li_tv.vval.v_dict;
 	char_u *p;
 
-	p = get_dict_string(dict, (char_u *)"ff", FALSE);
+	p = dict_get_string(dict, (char_u *)"ff", FALSE);
 	if (p == NULL)
-	    p = get_dict_string(dict, (char_u *)"fileformat", FALSE);
+	    p = dict_get_string(dict, (char_u *)"fileformat", FALSE);
 	if (p != NULL)
 	{
 	    if (check_ff_value(p) == FAIL)
@@ -3533,9 +3533,9 @@
 	    else
 		ea.force_ff = *p;
 	}
-	p = get_dict_string(dict, (char_u *)"enc", FALSE);
+	p = dict_get_string(dict, (char_u *)"enc", FALSE);
 	if (p == NULL)
-	    p = get_dict_string(dict, (char_u *)"encoding", FALSE);
+	    p = dict_get_string(dict, (char_u *)"encoding", FALSE);
 	if (p != NULL)
 	{
 	    ea.cmd = alloc((int)STRLEN(p) + 12);
@@ -3547,7 +3547,7 @@
 	    }
 	}
 
-	p = get_dict_string(dict, (char_u *)"bad", FALSE);
+	p = dict_get_string(dict, (char_u *)"bad", FALSE);
 	if (p != NULL)
 	    get_bad_opt(p, &ea);
 
@@ -3915,8 +3915,8 @@
 	d = argvars[2].vval.v_dict;
 	if (d != NULL)
 	{
-	    max_height = get_dict_number(d, (char_u *)"rows");
-	    max_width = get_dict_number(d, (char_u *)"columns");
+	    max_height = dict_get_number(d, (char_u *)"rows");
+	    max_width = dict_get_number(d, (char_u *)"columns");
 	}
     }