diff --git a/test/H5Fed/tetmesh_adjacencies.c b/test/H5Fed/tetmesh_adjacencies.c
index e8277fb..059b128 100644
--- a/test/H5Fed/tetmesh_adjacencies.c
+++ b/test/H5Fed/tetmesh_adjacencies.c
@@ -57,7 +57,7 @@ print_adjacencies_of_vertex (
 			*v = '\0';
 		}
 		if ( i < uadj_edges->num_items ) {
-			H5FedMapEntity2LocalVids (
+			H5FedLMapEdgeID2VertexIDs (
 				f, uadj_edges->items[i], local_vids );
 			snprintf ( k, sizeof(k), "=[%lld,%lld]=",
 				   local_vids[0], local_vids[1] );
@@ -65,7 +65,7 @@ print_adjacencies_of_vertex (
 			*k = '\0';
 		}
 		if ( i < uadj_triangles->num_items ) {
-			H5FedMapEntity2LocalVids (
+			H5FedLMapTriangleID2VertexIDs (
 				f, uadj_triangles->items[i], local_vids );
 			snprintf ( d, sizeof(d), "=[%lld,%lld,%lld]=",
 				   local_vids[0], local_vids[1], local_vids[2] );
@@ -73,7 +73,7 @@ print_adjacencies_of_vertex (
 			*d = '\0';
 		}
 		if ( i < uadj_tets->num_items ) {
-			H5FedMapEntity2LocalVids (
+			H5FedLMapTetID2VertexIDs (
 				f, uadj_tets->items[i], local_vids );
 			snprintf ( t, sizeof(t), "=[%lld,%lld,%lld,%lld]=",
 				   local_vids[0], local_vids[1],
@@ -126,7 +126,7 @@ print_adjacencies_of_edge (
 			*k = '\0';
 		}
 		if ( i < uadj_triangles->num_items ) {
-			H5FedMapEntity2LocalVids (
+			H5FedLMapTriangleID2VertexIDs (
 				f, uadj_triangles->items[i], local_vids );
 			snprintf ( d, sizeof(d), "=[%lld,%lld,%lld]=",
 				   local_vids[0], local_vids[1], local_vids[2] );
@@ -134,7 +134,7 @@ print_adjacencies_of_edge (
 			*d = '\0';
 		}
 		if ( i < uadj_tets->num_items ) {
-			H5FedMapEntity2LocalVids (
+			H5FedLMapTetID2VertexIDs (
 				f, uadj_tets->items[i], local_vids );
 			snprintf ( t, sizeof(t), "=[%lld,%lld,%lld,%lld]=",
 				   local_vids[0], local_vids[1],
@@ -181,7 +181,7 @@ print_adjacencies_of_triangle (
 			*v = '\0';
 		}
 		if ( i < dadj_edges->num_items ) {
-			H5FedMapEntity2LocalVids (
+			H5FedLMapEdgeID2VertexIDs (
 				f, dadj_edges->items[i], local_vids );
 			snprintf ( k, sizeof(k), "=[%lld,%lld]=",
 				   local_vids[0], local_vids[1] );
@@ -194,7 +194,7 @@ print_adjacencies_of_triangle (
 			*d = '\0';
 		}
 		if ( i < uadj_tets->num_items ) {
-			H5FedMapEntity2LocalVids (
+			H5FedLMapTetID2VertexIDs (
 				f, uadj_tets->items[i], local_vids );
 			snprintf ( t, sizeof(t), "=[%lld,%lld,%lld,%lld]=",
 				   local_vids[0], local_vids[1],
@@ -241,7 +241,7 @@ print_adjacencies_of_tet (
 			*v = '\0';
 		}
 		if ( i < dadj_edges->num_items ) {
-			H5FedMapEntity2LocalVids (
+			H5FedLMapEdgeID2VertexIDs (
 				f, dadj_edges->items[i], local_vids );
 			snprintf ( k, sizeof(k), "=[%lld,%lld]=",
 				   local_vids[0], local_vids[1] );
@@ -249,7 +249,7 @@ print_adjacencies_of_tet (
 			*k = '\0';
 		}
 		if ( i < dadj_triangles->num_items ) {
-			H5FedMapEntity2LocalVids (
+			H5FedLMapTriangleID2VertexIDs (
 				f, dadj_triangles->items[i], local_vids );
 			snprintf ( d, sizeof(d), "=[%lld,%lld,%lld]=",
 				   local_vids[0], local_vids[1], local_vids[2] );
@@ -285,7 +285,7 @@ traverse_vertices (
 	fprintf (
 		stderr,
 		"Computing all adjacencies of all vertices ... ");
-	while ( (local_id = H5FedTraverseVertices ( f, &id, P )) >= 0 ) {
+	while ( (local_id = H5FedTraverseVertices ( f, P )) >= 0 ) {
 		print_adjacencies_of_vertex ( f, local_id, &t );
 		num++;
 		t_total += t;
@@ -373,7 +373,7 @@ static h5_err_t
 traverse_tets (
 	h5_file_t * f
 	) {
-	h5_id_t id, local_id, parent_id, vids[4];
+	h5_id_t local_id, vids[4];
 	h5_id_t num = 0;
 	clock_t t_total = 0;
 	clock_t t_min = CLOCKS_PER_SEC;
@@ -384,7 +384,7 @@ traverse_tets (
 	fprintf (
 		stderr,
 		"Computing all adjacencies of all tetrahedra ... ");
-	while ( (local_id = H5FedTraverseElements (f, &id, &parent_id, vids )) >= 0 ) {
+	while ( (local_id = H5FedTraverseElements (f, vids )) >= 0 ) {
 		print_adjacencies_of_tet ( f, local_id, &t );
 		num++;
 		t_total += t;