diff --git a/assets/images/svg-icons/README.md b/assets/images/svg-icons/README.md
index a1938d420..d6ff7e70a 100644
--- a/assets/images/svg-icons/README.md
+++ b/assets/images/svg-icons/README.md
@@ -9,7 +9,7 @@ All of the starter SVG icons included in this repo are from [IcoMoon App](https:
 
 ### Inline SVG helper functions
 
-[`_s_get_svg( $args = array() ); // Return SVG markup`](../../blob/master/inc/template-tags.php#L125)
+[`_s_display_svg( $args = array() ); // Return SVG markup`](../../blob/master/inc/template-tags.php#L125)
 ```
 /**
  * Return SVG markup.
@@ -26,7 +26,7 @@ All of the starter SVG icons included in this repo are from [IcoMoon App](https:
 ```
 
 Example usage:
-`<?php echo _s_get_svg( array( 'icon' => 'twitter' ) ); ?>`
+`<?php echo _s_display_svg( array( 'icon' => 'twitter' ) ); ?>`
 
 Output:
 ```
diff --git a/inc/template-tags.php b/inc/template-tags.php
index 2c5758080..352d803d4 100755
--- a/inc/template-tags.php
+++ b/inc/template-tags.php
@@ -163,8 +163,8 @@ function _s_get_the_title( $args = array() ) {
 
 	// Set defaults.
 	$defaults = array(
-		'length'  => 12,
-		'more'    => '...',
+		'length' => 12,
+		'more'   => '...',
 	);
 
 	// Parse args.
@@ -333,7 +333,7 @@ function _s_display_social_network_links() {
 			if ( ! empty( $network_url ) ) : ?>
 				<li class="social-icon <?php echo esc_attr( $network ); ?>">
 					<a href="<?php echo esc_url( $network_url ); ?>">
-						<?php echo _s_get_svg( array( // WPCS: XSS ok.
+						<?php _s_display_svg( array(
 							'icon'  => $network . '-square',
 							'title' => /* translators: the social network name */ sprintf( esc_html_e( 'Link to %s', '_s' ), ucwords( esc_html( $network ) ) ),
 						) ); ?>
diff --git a/template-parts/scaffolding/scaffolding-icons.php b/template-parts/scaffolding/scaffolding-icons.php
index 59d54a535..aaa939bae 100644
--- a/template-parts/scaffolding/scaffolding-icons.php
+++ b/template-parts/scaffolding/scaffolding-icons.php
@@ -14,7 +14,7 @@
 	_s_display_scaffolding_section( array(
 		'title'       => 'SVG',
 		'description' => 'Display inline SVGs.',
-		'usage'       => '<?php _s_get_svg( array( \'icon\' => \'facebook-square\' ) ); ?>',
+		'usage'       => '<?php _s_display_svg( array( \'icon\' => \'facebook-square\' ) ); ?>',
 		'parameters'  => array(
 			'$args' => '(required) Configuration arguments.',
 		),
@@ -23,6 +23,6 @@
 			'title' => '(optional) The title of the icon. Default: none',
 			'desc'  => '(optional) The description of the icon. Default: none',
 		),
-		'output'       => _s_get_svg( array( 'icon' => 'facebook-square' ) ),
+		'output'       => _s_display_svg( array( 'icon' => 'facebook-square' ) ),
 	) ); ?>
 </section>
diff --git a/template-parts/sharing-icons.php b/template-parts/sharing-icons.php
index fcd9fe7de..b84252d40 100644
--- a/template-parts/sharing-icons.php
+++ b/template-parts/sharing-icons.php
@@ -12,7 +12,7 @@
 	<ul class="social-icons menu menu-horizontal">
 		<li class="social-icon">
 			<a href="<?php echo esc_url( _s_get_twitter_share_url() ); ?>" onclick="window.open(this.href, 'targetWindow', 'toolbar=no, location=no, status=no, menubar=no, scrollbars=yes, resizable=yes, top=150, left=0, width=600, height=300' ); return false;">
-				<?php echo _s_get_svg( array( // WPCS: XSS ok.
+				<?php _s_display_svg( array(
 					'icon'  => 'twitter-square',
 					'title' => 'Twitter',
 					'desc'  => esc_html__( 'Share on Twitter', '_s' ),
@@ -22,7 +22,7 @@
 		</li>
 		<li class="social-icon">
 			<a href="<?php echo esc_url( _s_get_facebook_share_url() ); ?>" onclick="window.open(this.href, 'targetWindow', 'toolbar=no, location=no, status=no, menubar=no, scrollbars=yes, resizable=yes, top=150, left=0, width=600, height=300' ); return false;">
-				<?php echo _s_get_svg( array( // WPCS: XSS ok.
+				<?php _s_display_svg( array(
 					'icon'  => 'facebook-square',
 					'title' => 'Facebook',
 					'desc'  => esc_html__( 'Share on Facebook', '_s' ),
@@ -32,7 +32,7 @@
 		</li>
 		<li class="social-icon">
 			<a href="<?php echo esc_url( _s_get_linkedin_share_url() ); ?>" onclick="window.open(this.href, 'targetWindow', 'toolbar=no, location=no, status=no, menubar=no, scrollbars=yes, resizable=yes, top=150, left=0, width=475, height=505' ); return false;">
-				<?php echo _s_get_svg( array( // WPCS: XSS ok.
+				<?php _s_display_svg( array(
 					'icon'  => 'linkedin-square',
 					'title' => 'LinkedIn',
 					'desc'  => esc_html__( 'Share on LinkedIn', '_s' ),