diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c
index 66e951ec..b73a8025 100644
--- a/drivers/atmodem/sim.c
+++ b/drivers/atmodem/sim.c
@@ -50,7 +50,7 @@ static void at_crsm_info_cb(gboolean ok, GAtResult *result, gpointer user_data)
 	const guint8 *response;
 	gint sw1, sw2, len;
 	int flen, rlen;
-	enum ofono_simfile_struct str;
+	enum ofono_sim_file_structure str;
 
 	dump_response("at_crsm_info_cb", ok, result);
 	decode_at_error(&error, g_at_result_final_response(result));
diff --git a/src/driver.h b/src/driver.h
index 842bc107..5929368a 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -103,10 +103,10 @@ struct ofono_own_number {
 };
 
 /* 51.011 Section 9.3 */
-enum ofono_simfile_struct {
-	OFONO_SIM_FILE_TRANSPARENT = 0,
-	OFONO_SIM_FILE_FIXED = 1,
-	OFONO_SIM_FILE_CYCLIC = 3
+enum ofono_sim_file_structure {
+	OFONO_SIM_FILE_STRUCTURE_TRANSPARENT = 0,
+	OFONO_SIM_FILE_STRUCTURE_FIXED = 1,
+	OFONO_SIM_FILE_STRUCTURE_CYCLIC = 3
 };
 
 /* Notification functions, the integer values here should map to
@@ -169,7 +169,7 @@ typedef void (*ofono_call_barring_cb_t)(const struct ofono_error *error,
 
 typedef void (*ofono_sim_file_info_cb_t)(const struct ofono_error *error,
 					int filelength,
-					enum ofono_simfile_struct structure,
+					enum ofono_sim_file_structure structure,
 					int recordlength, void *data);
 
 typedef void (*ofono_sim_read_cb_t)(const struct ofono_error *error,
diff --git a/src/sim.c b/src/sim.c
index 9c852929..d0a6ee3f 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -237,19 +237,19 @@ static void sim_spn_read_cb(const struct ofono_error *error,
 		sim_spn_notify(modem, l->data);
 }
 
-static void sim_spn_info_cb(const struct ofono_error *error,
-		int length, enum ofono_simfile_struct structure, int dummy,
-		void *data)
+static void sim_spn_info_cb(const struct ofono_error *error, int length,
+				enum ofono_sim_file_structure structure,
+				int dummy, void *data)
 {
 	struct ofono_modem *modem = data;
 	struct sim_manager_data *sim = modem->sim_manager;
 
 	if (error->type != OFONO_ERROR_TYPE_NO_ERROR || length <= 1 ||
-			structure != OFONO_SIM_FILE_TRANSPARENT)
+			structure != OFONO_SIM_FILE_STRUCTURE_TRANSPARENT)
 		return;
 
 	sim->ops->read_file_transparent(modem, SIM_EFSPN_FILEID, 0, length,
-			sim_spn_read_cb, modem);
+					sim_spn_read_cb, modem);
 }
 
 static gboolean sim_retrieve_spn(void *user_data)
@@ -258,7 +258,7 @@ static gboolean sim_retrieve_spn(void *user_data)
 	struct sim_manager_data *sim = modem->sim_manager;
 
 	sim->ops->read_file_info(modem, SIM_EFSPN_FILEID,
-			sim_spn_info_cb, modem);
+					sim_spn_info_cb, modem);
 
 	return FALSE;
 }