diff --git a/event.php b/event.php
index 9f2e5acd..07c57b10 100644
--- a/event.php
+++ b/event.php
@@ -2,7 +2,7 @@
 function sp_event_cpt_init() {
 	$name = __( 'Events', 'sportspress' );
 	$singular_name = __( 'Event', 'sportspress' );
-	$labels = sp_get_cpt_labels( $name, $singular_name );
+	$labels = sp_cpt_labels( $name, $singular_name );
 	$args = array(
 		'label' => $name,
 		'labels' => $labels,
@@ -81,9 +81,7 @@ function sp_event_stats_meta( $post ) {
 		$data = sp_array_combine( $players, sp_array_value( $stats, $value, array() ) );
 		?>
 		<div>
-			<p>
-				<strong><?php echo $value ? get_the_title( $value ) : sprintf( __( 'Select %s' ), 'Team' ); ?></strong>
-			</p>
+			<p><strong><?php echo $value ? get_the_title( $value ) : sprintf( __( 'Select %s' ), 'Team' ); ?></strong></p>
 			<?php sp_data_table( $data, $value, array( 'Player', 'Goals', 'Assists', 'Yellow Cards', 'Red Cards' ), true, false ); ?>
 		</div>
 		<?php
diff --git a/helpers.php b/helpers.php
index ea076920..cff29f13 100644
--- a/helpers.php
+++ b/helpers.php
@@ -55,8 +55,8 @@ if ( !function_exists( 'sp_array_combine' ) ) {
 	}
 }
 
-if ( !function_exists( 'sp_get_cpt_labels' ) ) {
-	function sp_get_cpt_labels( $name, $singular_name ) {
+if ( !function_exists( 'sp_cpt_labels' ) ) {
+	function sp_cpt_labels( $name, $singular_name ) {
 		$labels = array(
 			'name' => $name,
 			'singular_name' => $singular_name,
@@ -74,8 +74,8 @@ if ( !function_exists( 'sp_get_cpt_labels' ) ) {
 	}
 }
 
-if ( !function_exists( 'sp_get_tax_labels' ) ) {
-	function sp_get_tax_labels( $name, $singular_name ) {
+if ( !function_exists( 'sp_tax_labels' ) ) {
+	function sp_tax_labels( $name, $singular_name ) {
 		$labels = array(
 			'name' => $name,
 			'singular_name' => $singular_name,
diff --git a/league.php b/league.php
index 4e5acb1a..f1b518db 100644
--- a/league.php
+++ b/league.php
@@ -3,7 +3,7 @@ function sp_league_tax_init() {
 	$name = __( 'Leagues', 'sportspress' );
 	$singular_name = __( 'League', 'sportspress' );
 	$object_type = array( 'sp_team', 'sp_event', 'sp_player', 'sp_staff', 'sp_table', 'sp_list' );
-	$labels = sp_get_tax_labels( $name, $singular_name );
+	$labels = sp_tax_labels( $name, $singular_name );
 	$args = array(
 		'label' => $name,
 		'labels' => $labels,
diff --git a/list.php b/list.php
index f1a56b88..3612f619 100644
--- a/list.php
+++ b/list.php
@@ -2,7 +2,7 @@
 function sp_list_cpt_init() {
 	$name = __( 'Player Lists', 'sportspress' );
 	$singular_name = __( 'Player List', 'sportspress' );
-	$labels = sp_get_cpt_labels( $name, $singular_name );
+	$labels = sp_cpt_labels( $name, $singular_name );
 	$args = array(
 		'label' => $name,
 		'labels' => $labels,
diff --git a/player.php b/player.php
index 83435cac..469e5046 100644
--- a/player.php
+++ b/player.php
@@ -2,7 +2,7 @@
 function sp_player_cpt_init() {
 	$name = __( 'Players', 'sportspress' );
 	$singular_name = __( 'Player', 'sportspress' );
-	$labels = sp_get_cpt_labels( $name, $singular_name );
+	$labels = sp_cpt_labels( $name, $singular_name );
 	$args = array(
 		'label' => $name,
 		'labels' => $labels,
@@ -41,12 +41,8 @@ function sp_player_stats_meta( $post ) {
 		$data = sp_array_combine( $teams, sp_array_value( $stats, $league->term_id, array() ) );
 		?>
 		<div>
-			<p>
-				<strong><?php echo $league->name; ?></strong>
-			</p>
-			<?php
-				sp_data_table( $data, $league->term_id, array( 'Team', 'Played', 'Goals', 'Assists', 'Yellow Cards', 'Red Cards' ) );
-			?>
+			<p><strong><?php echo $league->name; ?></strong></p>
+			<?php sp_data_table( $data, $league->term_id, array( 'Team', 'Played', 'Goals', 'Assists', 'Yellow Cards', 'Red Cards' ) ); ?>
 		</div>
 		<?php
 	endforeach;
diff --git a/position.php b/position.php
index b2934d00..c556cdcb 100644
--- a/position.php
+++ b/position.php
@@ -3,7 +3,7 @@ function sp_position_tax_init() {
 	$name = __( 'Positions', 'sportspress' );
 	$singular_name = __( 'Position', 'sportspress' );
 	$object_type = array( 'sp_player', 'sp_staff' );
-	$labels = sp_get_tax_labels( $name, $singular_name );
+	$labels = sp_tax_labels( $name, $singular_name );
 	$args = array(
 		'label' => $name,
 		'labels' => $labels,
diff --git a/sponsor.php b/sponsor.php
index cc3d8256..a766d1ed 100644
--- a/sponsor.php
+++ b/sponsor.php
@@ -3,7 +3,7 @@ function sp_sponsor_tax_init() {
 	$name = __( 'Sponsors', 'sportspress' );
 	$singular_name = __( 'Sponsor', 'sportspress' );
 	$object_type = array( 'sp_team', 'sp_event', 'sp_player', 'sp_tournament', 'sp_venue' );
-	$labels = sp_get_tax_labels( $name, $singular_name );
+	$labels = sp_tax_labels( $name, $singular_name );
 	$args = array(
 		'label' => $name,
 		'labels' => $labels,
diff --git a/staff.php b/staff.php
index a991062c..689b26d2 100644
--- a/staff.php
+++ b/staff.php
@@ -2,7 +2,7 @@
 function sp_staff_cpt_init() {
 	$name = __( 'Staff', 'sportspress' );
 	$singular_name = __( 'Staff', 'sportspress' );
-	$labels = sp_get_cpt_labels( $name, $singular_name );
+	$labels = sp_cpt_labels( $name, $singular_name );
 	$args = array(
 		'label' => $name,
 		'labels' => $labels,
diff --git a/table.php b/table.php
index 5846b557..66f0de65 100644
--- a/table.php
+++ b/table.php
@@ -2,7 +2,7 @@
 function sp_table_cpt_init() {
 	$name = __( 'League Tables', 'sportspress' );
 	$singular_name = __( 'League Table', 'sportspress' );
-	$labels = sp_get_cpt_labels( $name, $singular_name );
+	$labels = sp_cpt_labels( $name, $singular_name );
 	$args = array(
 		'label' => $name,
 		'labels' => $labels,
diff --git a/team.php b/team.php
index 1a653027..e285ed5c 100644
--- a/team.php
+++ b/team.php
@@ -2,7 +2,7 @@
 function sp_team_cpt_init() {
 	$name = __( 'Teams', 'sportspress' );
 	$singular_name = __( 'Team', 'sportspress' );
-	$labels = sp_get_cpt_labels( $name, $singular_name );
+	$labels = sp_cpt_labels( $name, $singular_name );
 	$args = array(
 		'label' => $name,
 		'labels' => $labels,
diff --git a/tournament.php b/tournament.php
index 330c5e47..0acf23d3 100644
--- a/tournament.php
+++ b/tournament.php
@@ -2,7 +2,7 @@
 function sp_tournament_cpt_init() {
 	$name = __( 'Tournaments', 'sportspress' );
 	$singular_name = __( 'Tournament', 'sportspress' );
-	$labels = sp_get_cpt_labels( $name, $singular_name );
+	$labels = sp_cpt_labels( $name, $singular_name );
 	$args = array(
 		'label' => $name,
 		'labels' => $labels,
diff --git a/venue.php b/venue.php
index 990dcf9b..b899b376 100644
--- a/venue.php
+++ b/venue.php
@@ -2,7 +2,7 @@
 function sp_venue_cpt_init() {
 	$name = __( 'Venues', 'sportspress' );
 	$singular_name = __( 'Venue', 'sportspress' );
-	$labels = sp_get_cpt_labels( $name, $singular_name );
+	$labels = sp_cpt_labels( $name, $singular_name );
 	$args = array(
 		'label' => $name,
 		'labels' => $labels,