diff --git a/libasn1fix/asn1fix_bitstring.c b/libasn1fix/asn1fix_bitstring.c
index c9a09761f8122383a514ca8397bc90c3126d4ac3..4ef945dc131f373e104a72d03ec0d8904a4d3785 100644
--- a/libasn1fix/asn1fix_bitstring.c
+++ b/libasn1fix/asn1fix_bitstring.c
@@ -103,7 +103,7 @@ asn1f_BS_unparsed_convert(arg_t *arg, asn1p_value_t *value, asn1p_expr_t *ttype)
 	asn1p_module_t *mod;
 	asn1p_expr_t *V;
 	asn1p_expr_t *bit;
-	asn1_integer_t aI;
+	asn1c_integer_t aI;
 	uint8_t *bitbuf;
 	int bits;
 	int psize;
diff --git a/libasn1fix/asn1fix_constr.c b/libasn1fix/asn1fix_constr.c
index 66e7450e82afeb3c2dbee107482571ece76a3781..d837f35d662be5e723574d022e18208d43a83021 100644
--- a/libasn1fix/asn1fix_constr.c
+++ b/libasn1fix/asn1fix_constr.c
@@ -287,7 +287,7 @@ int
 asn1f_fix_constr_autotag(arg_t *arg) {
 	asn1p_expr_t *expr = arg->expr;
 	asn1p_expr_t *v;
-	asn1_integer_t tag_value = 0;
+	asn1c_integer_t tag_value = 0;
 	int r_value = 0;
 
 	switch(expr->expr_type) {
diff --git a/libasn1fix/asn1fix_crange.c b/libasn1fix/asn1fix_crange.c
index f6e111139ed1f5617ce97ac40f963266daecc1c5..974aa21ccca8576ae2bafbed5b55c6d06e6f7b41 100644
--- a/libasn1fix/asn1fix_crange.c
+++ b/libasn1fix/asn1fix_crange.c
@@ -352,7 +352,7 @@ static int _range_fill(asn1p_value_t *val, const asn1cnst_range_t *minmax, asn1c
 		 * However, (FROM("abc".."def")) is forbidden.
 		 * See also 47.4.4.
 		 */
-		asn1_integer_t vmin, vmax;
+		asn1c_integer_t vmin, vmax;
 		vmin = vmax = *p;
 		for(; p < pend; p++) {
 			asn1cnst_range_t *nr = _range_new();
diff --git a/libasn1fix/asn1fix_crange.h b/libasn1fix/asn1fix_crange.h
index 9d4763acefede112c753c8cb4bdd457242de00bb..06817796ceb9587b9cf53f63117254d4f7d4ad4d 100644
--- a/libasn1fix/asn1fix_crange.h
+++ b/libasn1fix/asn1fix_crange.h
@@ -8,7 +8,7 @@ typedef struct asn1cnst_edge_s {
 		ARE_VALUE,
 	} type;
 	int lineno;	/* Line where the corresponding token was found */
-	asn1_integer_t value;	/* Value when type is ARE_VALUE */
+	asn1c_integer_t value;	/* Value when type is ARE_VALUE */
 } asn1cnst_edge_t;
 
 typedef struct asn1cnst_range_s {
diff --git a/libasn1fix/asn1fix_enum.c b/libasn1fix/asn1fix_enum.c
index 4eb98135fb34adc7dbbbc22ad00593de889886fe..d0c0f2555d60d7caab6f21a11b10ef283ff5361a 100644
--- a/libasn1fix/asn1fix_enum.c
+++ b/libasn1fix/asn1fix_enum.c
@@ -7,7 +7,7 @@ int
 asn1f_fix_enum(arg_t *arg) {
 	asn1p_expr_t *expr = arg->expr;
 	asn1p_expr_t *ev;
-	asn1_integer_t max_value = -1;
+	asn1c_integer_t max_value = -1;
 	int rvalue = 0;
 	asn1p_expr_t *ext_marker = NULL;	/* "..." position */
 	int ret;
@@ -21,7 +21,7 @@ asn1f_fix_enum(arg_t *arg) {
 	 * 1. Scan the enumeration values in search for inconsistencies.
 	 */
 	TQ_FOR(ev, &(expr->members), next) {
-		asn1_integer_t eval;
+		asn1c_integer_t eval;
 
 		if(ev->value)
 			DEBUG("\tItem %s(%s)", ev->Identifier,