diff --git a/includes/class-sp-ajax.php b/includes/class-sp-ajax.php
index fd34eafd..5b1a19a5 100644
--- a/includes/class-sp-ajax.php
+++ b/includes/class-sp-ajax.php
@@ -470,8 +470,8 @@ class SP_AJAX {
 			</p>
 			<p>
 				<label>
-					<?php _e( 'Event ID:', 'sportspress' ); ?>
-					<input class="regular-text" type="number" name="event_id">
+					<?php _e( 'Event:', 'sportspress' ); ?>
+					<input class="regular-text" type="number" name="event">
 				</label>
 			</p>
 			<p>
@@ -1037,7 +1037,7 @@ class SP_AJAX {
                     args.show_all_events_link = $div.find('[name=show_all_events_link]:checked').length;
                 } else if ( 'event_blocks' == type ) {
                     args.title = $div.find('[name=title]').val();
-		    args.event_id = $div.find('[name=event_id]').val();
+                    args.event = $div.find('[name=event]').val();
                     args.team = $div.find('[name=team]').val();
                     args.league = $div.find('[name=league]').val();
                     args.season = $div.find('[name=season]').val();
diff --git a/includes/class-sp-calendar.php b/includes/class-sp-calendar.php
index cb49e953..a4824e73 100644
--- a/includes/class-sp-calendar.php
+++ b/includes/class-sp-calendar.php
@@ -47,7 +47,7 @@ class SP_Calendar extends SP_Secondary_Post {
 	public $number;
 	
 	/** @var int The event ID. */
-	public $event_id;
+	public $event;
 
 	/**
 	 * __construct function.
@@ -281,8 +281,8 @@ class SP_Calendar extends SP_Secondary_Post {
 				);
 			}
 		
-			if ( $this->event_id) {
-				$args['p'] = $this->event_id;
+			if ( $this->event) {
+				$args['p'] = $this->event;
 			}
 
 			if ( 'auto' === $this->date && 'any' === $this->status ) {
diff --git a/templates/event-blocks.php b/templates/event-blocks.php
index f727e190..318e1624 100644
--- a/templates/event-blocks.php
+++ b/templates/event-blocks.php
@@ -11,7 +11,7 @@ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 
 $defaults = array(
 	'id' => null,
-	'event_id' => null,
+	'event' => null,
 	'title' => false,
 	'status' => 'default',
 	'date' => 'default',
@@ -59,8 +59,8 @@ if ( $date_future != 'default' )
 	$calendar->future = $date_future;
 if ( $date_relative != 'default' )
 	$calendar->relative = $date_relative;
-if ( $event_id ) 
-	$calendar->event_id = $event_id;
+if ( $event ) 
+	$calendar->event = $event;
 if ( $league )
 	$calendar->league = $league;
 if ( $season )