diff --git a/block/blk-core.c b/block/blk-core.c
index 2621c12..a675508 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -309,9 +309,9 @@
 		return;
 
 	if (!q->notified_urgent &&
-		q->elevator->type->ops.elevator_is_urgent_fn &&
+		q->elevator->elevator_type->ops.elevator_is_urgent_fn &&
 		q->urgent_request_fn &&
-		q->elevator->type->ops.elevator_is_urgent_fn(q)) {
+		q->elevator->elevator_type->ops.elevator_is_urgent_fn(q)) {
 		q->notified_urgent = true;
 		q->urgent_request_fn(q);
 	} else
@@ -993,7 +993,7 @@
 {
 	if (unlikely(!q))
 		return false;
-	return q->elevator->type->ops.elevator_reinsert_req_fn ? true : false;
+	return q->elevator->elevator_type->ops.elevator_reinsert_req_fn ? true : false;
 }
 EXPORT_SYMBOL(blk_reinsert_req_sup);
 
diff --git a/block/elevator.c b/block/elevator.c
index 5616265..df02e8e 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -626,10 +626,10 @@
 {
 	int res;
 
-	if (!q->elevator->type->ops.elevator_reinsert_req_fn)
+	if (!q->elevator->elevator_type->ops.elevator_reinsert_req_fn)
 		return -EPERM;
 
-	res = q->elevator->type->ops.elevator_reinsert_req_fn(q, rq);
+	res = q->elevator->elevator_type->ops.elevator_reinsert_req_fn(q, rq);
 	if (!res) {
 		/*
 		 * it already went through dequeue, we need to decrement the
diff --git a/block/row-iosched.c b/block/row-iosched.c
index 17ec40c..fe740bd 100644
--- a/block/row-iosched.c
+++ b/block/row-iosched.c
@@ -165,7 +165,7 @@
 	unsigned int			cycle_flags;
 };
 
-#define RQ_ROWQ(rq) ((struct row_queue *) ((rq)->elv.priv[0]))
+#define RQ_ROWQ(rq) ((struct row_queue *) ((rq)->elevator_private[0]))
 
 #define row_log(q, fmt, args...)   \
 	blk_add_trace_msg(q, "%s():" fmt , __func__, ##args)
@@ -624,7 +624,7 @@
 	unsigned long flags;
 
 	spin_lock_irqsave(q->queue_lock, flags);
-	rq->elv.priv[0] =
+	rq->elevator_private[0] =
 		(void *)(&rd->row_queues[get_queue_type(rq)]);
 	spin_unlock_irqrestore(q->queue_lock, flags);