diff --git a/platforms/wordpress/templates/Template_Component.php b/platforms/wordpress/templates/Template_Component.php
index 72594ab..081b075 100644
--- a/platforms/wordpress/templates/Template_Component.php
+++ b/platforms/wordpress/templates/Template_Component.php
@@ -12,7 +12,8 @@ class <%= blockClassModel %>_Component extends \Core\Component {
     $args = Helpers\<%= blockClassModel %>_API::prepare_args( $args );
 
     $output = ( include( __DIR__ . '/templates/<%= blockFilename %>.template.php' ) )( array_merge( [], $args ), self::class );
-    return apply_filters( 'the_content', $output );
+    //return apply_filters( 'the_content', $output );
+    return $output;
 	}
 
   <% if (!include_acf_block && !include_native_gutenberg_block) { %>function register_assets(): void {
@@ -20,10 +21,10 @@ class <%= blockClassModel %>_Component extends \Core\Component {
     // $version = \Core\Global_Functions::get_current_version_number(); // In Theme
 
     // $base_path = get_template_directory_uri() . '/components/partials/<%= blockFilename %>/';
-    wp_enqueue_style( '<%= blockFilename %>', plugins_url( 'templates/styles/<%= blockFilename %>.min.css', __FILE__ ), ['assets-style'], get_blocks_version() );<% if (include_script) { %>
-    wp_enqueue_script( '<%= blockFilename %>', plugins_url( 'templates/scripts/<%= blockFilename %>.min.js', __FILE__ ), ['assets-script'], get_blocks_version(), true );<% } %>
+    wp_enqueue_style( 'block-<%= blockFilename %>', plugins_url( 'templates/styles/<%= blockFilename %>.min.css', __FILE__ ), ['assets-style'], get_blocks_version() );<% if (include_script) { %>
+    wp_enqueue_script( 'block-<%= blockFilename %>', plugins_url( 'templates/scripts/<%= blockFilename %>.min.js', __FILE__ ), ['assets-script'], get_blocks_version(), true );<% } %>
 
-    wp_enqueue_script( 'script-<%= blockFilename %>' );
+    wp_enqueue_script( 'script-block-<%= blockFilename %>' );
   }<% } %>
 
   <% if (include_elementor_widget) { %>function register_custom_logic(): void {
@@ -37,8 +38,8 @@ class <%= blockClassModel %>_Component extends \Core\Component {
 <% } %><% if (include_acf_block) { %>  function register_acf_block() {
     $this->register_block( __DIR__ . "/<%= blockFilename %>.block.json", [
       'enqueue_assets'  => function () {
-	      wp_enqueue_style( '<%= blockFilename %>', plugins_url( 'templates/styles/<%= blockFilename %>.min.css', __FILE__ ), ['assets-style'], get_blocks_version() );<% if (include_script) { %>
-	      wp_enqueue_script( '<%= blockFilename %>', plugins_url( 'templates/scripts/<%= blockFilename %>.min.js', __FILE__ ), ['assets-script'], get_blocks_version(), true );<% } %>
+	      wp_enqueue_style( 'block-<%= blockFilename %>', plugins_url( 'templates/styles/<%= blockFilename %>.min.css', __FILE__ ), ['assets-style'], get_blocks_version() );<% if (include_script) { %>
+	      wp_enqueue_script( 'block-<%= blockFilename %>', plugins_url( 'templates/scripts/<%= blockFilename %>.min.js', __FILE__ ), ['assets-script'], get_blocks_version(), true );<% } %>
       },
       'default'        => Helpers\<%= blockClassModel %>_Defaults::default_args(),
       'supports' => [