diff --git a/Azure/StoredProcs/cstore_SuggestedTables.sql b/Azure/StoredProcs/cstore_SuggestedTables.sql
index 645f0e5..faa7b39 100644
--- a/Azure/StoredProcs/cstore_SuggestedTables.sql
+++ b/Azure/StoredProcs/cstore_SuggestedTables.sql
@@ -24,6 +24,9 @@
 		- CLR support is not included or tested
 		- Output [Min RowGroups] is not taking present partitions into calculations yet :)
 		- InMemory OLTP compatibility is not tested
+	
+	Changes in 1.0.3
+		* Changed the name of the @tableNamePattern to @tableName to follow the same standard across all CISL functions
 */
 
 declare @SQLServerVersion nvarchar(128) = cast(SERVERPROPERTY('ProductVersion') as NVARCHAR(128)), 
@@ -47,7 +50,7 @@ create procedure dbo.cstore_SuggestedTables(
 		@minRowsToConsider bigint = 500000,							-- Minimum number of rows for a table to be considered for the suggestion inclusion
 		@minSizeToConsiderInGB Decimal(16,3) = 0.00,				-- Minimum size in GB for a table to be considered for the suggestion inclusion
 		@schemaName nvarchar(256) = NULL,							-- Allows to show data filtered down to the specified schema
-		@tableNamePattern nvarchar(256) = NULL,						-- Allows to show data filtered down to the specified table name pattern
+		@tableName nvarchar(256) = NULL,							-- Allows to show data filtered down to the specified table name pattern
 		@considerColumnsOver8K bit = 1,								-- Include in the results tables, which columns sum extends over 8000 bytes (and thus not supported in Columnstore)
 		@showReadyTablesOnly bit = 0,								-- Shows only those Rowstore tables that can already get Columnstore Index without any additional work
 		@showUnsupportedColumnsDetails bit = 0,						-- Shows a list of all Unsupported from the listed tables
@@ -189,7 +192,7 @@ begin
 					from sys.indexes ind
 					where t.object_id = ind.object_id
 						and ind.type in (5,6) ) = 0    -- Filtering out tables with existing Columnstore Indexes
-			 and (@tableNamePattern is null or object_name (t.object_id) like '%' + @tableNamePattern + '%')
+			 and (@tableName is null or object_name (t.object_id) like '%' + @tableName + '%')
 			 and (@schemaName is null or object_schema_name( t.object_id ) = @schemaName)
 			 and (( @showReadyTablesOnly = 1 
 					and  
diff --git a/Azure/suggested_tables.sql b/Azure/suggested_tables.sql
index bc7e6cc..7886cff 100644
--- a/Azure/suggested_tables.sql
+++ b/Azure/suggested_tables.sql
@@ -24,13 +24,16 @@
 		- CLR support is not included or tested
 		- Output [Min RowGroups] is not taking present partitions into calculations yet :)
 		- InMemory OLTP compatibility is not tested
+
+	Changes in 1.0.3
+		* Changed the name of the @tableNamePattern to @tableName to follow the same standard across all CISL functions
 */
 
 -- Params --
 declare @minRowsToConsider bigint = 500000,							-- Minimum number of rows for a table to be considered for the suggestion inclusion
 		@minSizeToConsiderInGB Decimal(16,3) = 0.00,				-- Minimum size in GB for a table to be considered for the suggestion inclusion
 		@schemaName nvarchar(256) = NULL,							-- Allows to show data filtered down to the specified schema
-		@tableNamePattern nvarchar(256) = NULL,						-- Allows to show data filtered down to the specified table name pattern
+		@tableName nvarchar(256) = NULL,							-- Allows to show data filtered down to the specified table name pattern
 		@considerColumnsOver8K bit = 1,								-- Include in the results tables, which columns sum extends over 8000 bytes (and thus not supported in Columnstore)
 		@showReadyTablesOnly bit = 1,								-- Shows only those Rowstore tables that can already get Columnstore Index without any additional work
 		@showUnsupportedColumnsDetails bit = 0,						-- Shows a list of all Unsupported from the listed tables
diff --git a/SQL-2012/StoredProcs/cstore_SuggestedTables.sql b/SQL-2012/StoredProcs/cstore_SuggestedTables.sql
index 7f1e486..a013e62 100644
--- a/SQL-2012/StoredProcs/cstore_SuggestedTables.sql
+++ b/SQL-2012/StoredProcs/cstore_SuggestedTables.sql
@@ -24,6 +24,9 @@
 		- CLR support is not included or tested
 		- Output [Min RowGroups] is not taking present partitions into calculations yet :)
 		- Data Precision is not being taken into account
+
+	Changes in 1.0.3
+		* Changed the name of the @tableNamePattern to @tableName to follow the same standard across all CISL functions	
 */
 
 declare @SQLServerVersion nvarchar(128) = cast(SERVERPROPERTY('ProductVersion') as NVARCHAR(128)), 
@@ -54,7 +57,7 @@ create procedure dbo.cstore_SuggestedTables(
 		@minRowsToConsider bigint = 500000,							-- Minimum number of rows for a table to be considered for the suggestion inclusion
 		@minSizeToConsiderInGB Decimal(16,3) = 0.00,				-- Minimum size in GB for a table to be considered for the suggestion inclusion
 		@schemaName nvarchar(256) = NULL,							-- Allows to show data filtered down to the specified schema
-		@tableNamePattern nvarchar(256) = NULL,						-- Allows to show data filtered down to the specified table name pattern
+		@tableName nvarchar(256) = NULL,							-- Allows to show data filtered down to the specified table name pattern
 		@considerColumnsOver8K bit = 1,								-- Include in the results tables, which columns sum extends over 8000 bytes (and thus not supported in Columnstore)
 		@showReadyTablesOnly bit = 0,								-- Shows only those Rowstore tables that can already get Columnstore Index without any additional work
 		@showUnsupportedColumnsDetails bit = 0,						-- Shows a list of all Unsupported from the listed tables
@@ -183,7 +186,7 @@ begin
 					from sys.indexes ind
 					where t.object_id = ind.object_id
 						and ind.type in (5,6) ) = 0
-			 and (@tableNamePattern is null or object_name (t.object_id) like '%' + @tableNamePattern + '%')
+			 and (@tableName is null or object_name (t.object_id) like '%' + @tableName + '%')
 			 and (@schemaName is null or object_schema_name( t.object_id ) = @schemaName)
 			 and (( @showReadyTablesOnly = 1 
 					and  
diff --git a/SQL-2012/suggested_tables.sql b/SQL-2012/suggested_tables.sql
index 278538f..e538f78 100644
--- a/SQL-2012/suggested_tables.sql
+++ b/SQL-2012/suggested_tables.sql
@@ -24,13 +24,16 @@
 		- CLR support is not included or tested
 		- Output [Min RowGroups] is not taking present partitions into calculations yet :)
 		- Data Precision is not being taken into account
+
+	Changes in 1.0.3
+		* Changed the name of the @tableNamePattern to @tableName to follow the same standard across all CISL functions	
 */
 
 -- Params --
 declare @minRowsToConsider bigint = 500000,							-- Minimum number of rows for a table to be considered for the suggestion inclusion
 		@minSizeToConsiderInGB Decimal(16,3) = 0.00,				-- Minimum size in GB for a table to be considered for the suggestion inclusion
 		@schemaName nvarchar(256) = NULL,							-- Allows to show data filtered down to the specified schema
-		@tableNamePattern nvarchar(256) = NULL,						-- Allows to show data filtered down to the specified table name pattern
+		@tableName nvarchar(256) = NULL,							-- Allows to show data filtered down to the specified table name pattern
 		@considerColumnsOver8K bit = 1,								-- Include in the results tables, which columns sum extends over 8000 bytes (and thus not supported in Columnstore)
 		@showReadyTablesOnly bit = 0,								-- Shows only those Rowstore tables that can already get Columnstore Index without any additional work
 		@showUnsupportedColumnsDetails bit = 0,						-- Shows a list of all Unsupported from the listed tables
@@ -180,7 +183,7 @@ select t.object_id as [ObjectId]
 				from sys.indexes ind
 				where t.object_id = ind.object_id
 					and ind.type in (5,6) ) = 0
-		 and (@tableNamePattern is null or object_name (t.object_id) like '%' + @tableNamePattern + '%')
+		 and (@tableName is null or object_name (t.object_id) like '%' + @tableName + '%')
 		 and (@schemaName is null or object_schema_name( t.object_id ) = @schemaName)
 		 and (( @showReadyTablesOnly = 1 
 				and  
diff --git a/SQL-2014/StoredProcs/cstore_SuggestedTables.sql b/SQL-2014/StoredProcs/cstore_SuggestedTables.sql
index fb003e8..6d3dadc 100644
--- a/SQL-2014/StoredProcs/cstore_SuggestedTables.sql
+++ b/SQL-2014/StoredProcs/cstore_SuggestedTables.sql
@@ -23,6 +23,9 @@
 		- @showTSQLCommandsBeta parameter is in alpha version and not pretending to be complete any time soon. This output is provided as a basic help & guide convertion to Columnstore Indexes.
 		- CLR support is not included or tested
 		- Output [Min RowGroups] is not taking present partitions into calculations yet :)
+
+	Changes in 1.0.3
+		* Changed the name of the @tableNamePattern to @tableName to follow the same standard across all CISL functions		
 */
 
 declare @SQLServerVersion nvarchar(128) = cast(SERVERPROPERTY('ProductVersion') as NVARCHAR(128)), 
@@ -52,7 +55,7 @@ create procedure dbo.cstore_SuggestedTables(
 		@minRowsToConsider bigint = 500000,							-- Minimum number of rows for a table to be considered for the suggestion inclusion
 		@minSizeToConsiderInGB Decimal(16,3) = 0.00,				-- Minimum size in GB for a table to be considered for the suggestion inclusion
 		@schemaName nvarchar(256) = NULL,							-- Allows to show data filtered down to the specified schema
-		@tableNamePattern nvarchar(256) = NULL,						-- Allows to show data filtered down to the specified table name pattern
+		@tableName nvarchar(256) = NULL,							-- Allows to show data filtered down to the specified table name pattern
 		@considerColumnsOver8K bit = 1,								-- Include in the results tables, which columns sum extends over 8000 bytes (and thus not supported in Columnstore)
 		@showReadyTablesOnly bit = 0,								-- Shows only those Rowstore tables that can already get Columnstore Index without any additional work
 		@showUnsupportedColumnsDetails bit = 0,						-- Shows a list of all Unsupported from the listed tables
@@ -194,7 +197,7 @@ begin
 				from sys.indexes ind
 				where t.object_id = ind.object_id
 					and ind.type in (5,6) ) = 0    -- Filtering out tables with existing Columnstore Indexes
-			 and (@tableNamePattern is null or object_name (t.object_id) like '%' + @tableNamePattern + '%')
+			 and (@tableName is null or object_name (t.object_id) like '%' + @tableName + '%')
 			 and (@schemaName is null or object_schema_name( t.object_id ) = @schemaName)
 			 and (( @showReadyTablesOnly = 1 
 					and  
diff --git a/SQL-2014/suggested_tables.sql b/SQL-2014/suggested_tables.sql
index 27bc10a..e5dc61a 100644
--- a/SQL-2014/suggested_tables.sql
+++ b/SQL-2014/suggested_tables.sql
@@ -23,13 +23,16 @@
 		- @showTSQLCommandsBeta parameter is in alpha version and not pretending to be complete any time soon. This output is provided as a basic help & guide convertion to Columnstore Indexes.
 		- CLR support is not included or tested
 		- Output [Min RowGroups] is not taking present partitions into calculations yet :)
+
+	Changes in 1.0.3
+		* Changed the name of the @tableNamePattern to @tableName to follow the same standard across all CISL functions	
 */
 
 -- Params --
 declare @minRowsToConsider bigint = 500000,							-- Minimum number of rows for a table to be considered for the suggestion inclusion
 		@minSizeToConsiderInGB Decimal(16,3) = 0.00,				-- Minimum size in GB for a table to be considered for the suggestion inclusion
 		@schemaName nvarchar(256) = NULL,							-- Allows to show data filtered down to the specified schema
-		@tableNamePattern nvarchar(256) = NULL,						-- Allows to show data filtered down to the specified table name pattern
+		@tableName nvarchar(256) = NULL,							-- Allows to show data filtered down to the specified table name pattern
 		@considerColumnsOver8K bit = 1,								-- Include in the results tables, which columns sum extends over 8000 bytes (and thus not supported in Columnstore)
 		@showReadyTablesOnly bit = 0,								-- Shows only those Rowstore tables that can already get Columnstore Index without any additional work
 		@showUnsupportedColumnsDetails bit = 0,						-- Shows a list of all Unsupported from the listed tables
@@ -190,7 +193,7 @@ select t.object_id as [ObjectId]
 				from sys.indexes ind
 				where t.object_id = ind.object_id
 					and ind.type in (5,6) ) = 0    -- Filtering out tables with existing Columnstore Indexes
-		 and (@tableNamePattern is null or object_name (t.object_id) like '%' + @tableNamePattern + '%')
+		 and (@tableName is null or object_name (t.object_id) like '%' + @tableName + '%')
 		 and (@schemaName is null or object_schema_name( t.object_id ) = @schemaName)
 		 and (( @showReadyTablesOnly = 1 
 				and  
diff --git a/SQL-2016/StoredProcs/cstore_SuggestedTables.sql b/SQL-2016/StoredProcs/cstore_SuggestedTables.sql
new file mode 100644
index 0000000..05a6168
--- /dev/null
+++ b/SQL-2016/StoredProcs/cstore_SuggestedTables.sql
@@ -0,0 +1,345 @@
+/*
+	Columnstore Indexes Scripts Library for SQL Server 2016: 
+	Suggested Tables - Lists tables which potentially can be interesting for implementing Columnstore Indexes
+	Version: 1.0.3, November 2015
+
+	Copyright 2015 Niko Neugebauer, OH22 IS (http://www.nikoport.com/columnstore/), (http://www.oh22.is/)
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+	you may not use this file except in compliance with the License.
+	You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+	Known Issues & Limitations: 
+		- @showTSQLCommandsBeta parameter is in alpha version and not pretending to be complete any time soon. This output is provided as a basic help & guide convertion to Columnstore Indexes.
+		- CLR support is not included or tested
+		- Output [Min RowGroups] is not taking present partitions into calculations yet :)
+		- InMemory OLTP compatibility is not tested
+	
+	Changes in 1.0.3
+		* Changed the name of the @tableNamePattern to @tableName to follow the same standard across all CISL functions
+*/
+
+declare @SQLServerVersion nvarchar(128) = cast(SERVERPROPERTY('ProductVersion') as NVARCHAR(128)), 
+		@SQLServerEdition nvarchar(128) = cast(SERVERPROPERTY('Edition') as NVARCHAR(128));
+declare @errorMessage nvarchar(512);
+
+-- Ensure that we are running SQL Server 2016
+if substring(@SQLServerVersion,1,CHARINDEX('.',@SQLServerVersion)-1) <> N'13'
+begin
+	set @errorMessage = (N'You are not running a SQL Server 2016. Your SQL Server version is ' + @SQLServerVersion);
+	Throw 51000, @errorMessage, 1;
+end
+
+if SERVERPROPERTY('EngineEdition') <> 3 
+begin
+	set @errorMessage = (N'Your SQL Server 2016 Edition is not an Enterprise or a Developer Edition: Your are running a ' + @SQLServerEdition);
+	Throw 51000, @errorMessage, 1;
+end
+
+--------------------------------------------------------------------------------------------------------------------
+if EXISTS (select * from sys.objects where type = 'p' and name = 'cstore_SuggestedTables' and schema_id = SCHEMA_ID('dbo') )
+	Drop Procedure dbo.cstore_SuggestedTables;
+GO
+
+create procedure dbo.cstore_SuggestedTables(
+-- Params --
+		@minRowsToConsider bigint = 500000,							-- Minimum number of rows for a table to be considered for the suggestion inclusion
+		@minSizeToConsiderInGB Decimal(16,3) = 0.00,				-- Minimum size in GB for a table to be considered for the suggestion inclusion
+		@schemaName nvarchar(256) = NULL,							-- Allows to show data filtered down to the specified schema
+		@tableName nvarchar(256) = NULL,							-- Allows to show data filtered down to the specified table name pattern
+		@considerColumnsOver8K bit = 1,								-- Include in the results tables, which columns sum extends over 8000 bytes (and thus not supported in Columnstore)
+		@showReadyTablesOnly bit = 0,								-- Shows only those Rowstore tables that can already get Columnstore Index without any additional work
+		@showUnsupportedColumnsDetails bit = 0,						-- Shows a list of all Unsupported from the listed tables
+		@showTSQLCommandsBeta bit = 0,								-- Shows a list with Commands for dropping the objects that prevent Columnstore Index creation
+		@columnstoreIndexTypeForTSQL varchar(20) = 'Clustered'		-- Allows to define the type of Columnstore Index to be created eith possible values of 'Clustered' and 'Nonclustered'
+-- end of --
+) as 
+begin
+	set nocount on;
+
+	declare 
+		@readCommitedSnapshot tinyint = 0,
+		@snapshotIsolation tinyint = 0;
+
+	-- Verify Snapshot Isolation Level or Read Commited Snapshot 
+	select @readCommitedSnapshot = is_read_committed_snapshot_on, 
+		@snapshotIsolation = snapshot_isolation_state
+		from sys.databases
+		where database_id = DB_ID();
+
+	-- Returns tables suggested for using Columnstore Indexes for the DataWarehouse environments
+	if OBJECT_ID('tempdb..#TablesToColumnstore') IS NOT NULL
+		drop table #TablesToColumnstore;
+
+	create table #TablesToColumnstore(
+		[ObjectId] int NOT NULL PRIMARY KEY,
+		[TableName] nvarchar(1000) NOT NULL,
+		[ShortTableName] nvarchar(256) NOT NULL,
+		[Row Count] bigint NOT NULL,
+		[Min RowGroups] smallint NOT NULL,
+		[Size in GB] decimal(16,3) NOT NULL,
+		[Cols Count] smallint NOT NULL,
+		[String Cols] smallint NOT NULL,
+		[Sum Length] int NOT NULL,
+		[Unsupported] smallint NOT NULL,
+		[LOBs] smallint NOT NULL,
+		[Computed] smallint NOT NULL,
+		[Clustered Index] tinyint NOT NULL,
+		[Nonclustered Indexes] smallint NOT NULL,
+		[XML Indexes] smallint NOT NULL,
+		[Spatial Indexes] smallint NOT NULL,
+		[Primary Key] tinyint NOT NULL,
+		[Foreign Keys] smallint NOT NULL,
+		[Unique Constraints] smallint NOT NULL,
+		[Triggers] smallint NOT NULL,
+		[RCSI] tinyint NOT NULL,
+		[Snapshot] tinyint NOT NULL,
+		[CDC] tinyint NOT NULL,
+		[CT] tinyint NOT NULL,
+		[InMemoryOLTP] tinyint NOT NULL,
+		[Replication] tinyint NOT NULL,
+		[FileStream] tinyint NOT NULL,
+		[FileTable] tinyint NOT NULL
+	);
+
+	insert into #TablesToColumnstore
+	select t.object_id as [ObjectId]
+		, quotename(object_schema_name(t.object_id)) + '.' + quotename(object_name(t.object_id)) as 'TableName'
+		, replace(object_name(t.object_id),' ', '') as 'ShortTableName'
+		, sum(p.rows) as 'Row Count'
+		, ceiling(sum(p.rows)/1045678.) as 'Min RowGroups' 
+		, cast( sum(a.total_pages) * 8.0 / 1024. / 1024 as decimal(16,3)) as 'size in GB'
+		, (select count(*) from sys.columns as col
+			where t.object_id = col.object_id ) as 'Cols Count'
+		, (select count(*) 
+				from sys.columns as col
+					inner join sys.types as tp
+						on col.user_type_id = tp.user_type_id
+				where t.object_id = col.object_id and 
+					 UPPER(tp.name) in ('VARCHAR','NVARCHAR','CHAR','NCHAR','SYSNAME') 
+		   ) as 'String Cols'
+		, (select sum(col.max_length) 
+				from sys.columns as col
+					inner join sys.types as tp
+						on col.user_type_id = tp.user_type_id
+				where t.object_id = col.object_id 
+		  ) as 'Sum Length'
+		, (select count(*) 
+				from sys.columns as col
+					inner join sys.types as tp
+						on col.user_type_id = tp.user_type_id
+				where t.object_id = col.object_id and 
+					 (UPPER(tp.name) in ('TEXT','NTEXT','TIMESTAMP','HIERARCHYID','SQL_VARIANT','XML','GEOGRAPHY','GEOMETRY') OR
+					  (UPPER(tp.name) in ('VARCHAR','NVARCHAR','CHAR','NCHAR') and (col.max_length = 8000 or col.max_length = -1)) 
+					 )
+		   ) as 'Unsupported'
+		, (select count(*) 
+				from sys.columns as col
+					inner join sys.types as tp
+						on col.user_type_id = tp.user_type_id
+				where t.object_id = col.object_id and 
+					 (UPPER(tp.name) in ('VARCHAR','NVARCHAR','CHAR','NCHAR') and (col.max_length = 8000 or col.max_length = -1)) 
+		   ) as 'LOBs'
+		, (select count(*) 
+				from sys.columns as col
+				where is_computed = 1 ) as 'Computed'
+		, (select count(*)
+				from sys.indexes ind
+				where type = 1 AND ind.object_id = t.object_id ) as 'Clustered Index'
+		, (select count(*)
+				from sys.indexes ind
+				where type = 2 AND ind.object_id = t.object_id ) as 'Nonclustered Indexes'
+		, (select count(*)
+				from sys.indexes ind
+				where type = 3 AND ind.object_id = t.object_id ) as 'XML Indexes'
+		, (select count(*)
+				from sys.indexes ind
+				where type = 4 AND ind.object_id = t.object_id ) as 'Spatial Indexes'
+		, (select count(*)
+				from sys.objects
+				where UPPER(type) = 'PK' AND parent_object_id = t.object_id ) as 'Primary Key'
+		, (select count(*)
+				from sys.objects
+				where UPPER(type) = 'F' AND parent_object_id = t.object_id ) as 'Foreign Keys'
+		, (select count(*)
+				from sys.objects
+				where UPPER(type) in ('UQ') AND parent_object_id = t.object_id ) as 'Unique Constraints'
+		, (select count(*)
+				from sys.objects
+				where UPPER(type) in ('TA','TR') AND parent_object_id = t.object_id ) as 'Triggers'
+		, @readCommitedSnapshot as 'RCSI'
+		, @snapshotIsolation as 'Snapshot'
+		, t.is_tracked_by_cdc as 'CDC'
+		, (select count(*) 
+				from sys.change_tracking_tables ctt with(READUNCOMMITTED)
+				where ctt.object_id = t.object_id and ctt.is_track_columns_updated_on = 1 
+					  and DB_ID() in (select database_id from sys.change_tracking_databases ctdb)) as 'CT'
+		, t.is_memory_optimized as 'InMemoryOLTP'
+		, t.is_replicated as 'Replication'
+		, coalesce(t.filestream_data_space_id,0,1) as 'FileStream'
+		, t.is_filetable as 'FileTable'
+		from sys.tables t
+			inner join sys.partitions as p 
+				ON t.object_id = p.object_id
+			inner join sys.allocation_units as a 
+				ON p.partition_id = a.container_id
+		where p.data_compression in (0,1,2) -- None, Row, Page
+			 and (select count(*)
+					from sys.indexes ind
+					where t.object_id = ind.object_id
+						and ind.type in (5,6) ) = 0    -- Filtering out tables with existing Columnstore Indexes
+			 and (@tableName is null or object_name (t.object_id) like '%' + @tableName + '%')
+			 and (@schemaName is null or object_schema_name( t.object_id ) = @schemaName)
+			 and (( @showReadyTablesOnly = 1 
+					and  
+					(select count(*) 
+						from sys.columns as col
+							inner join sys.types as tp
+								on col.system_type_id = tp.system_type_id
+						where t.object_id = col.object_id and 
+								(UPPER(tp.name) in ('TEXT','NTEXT','TIMESTAMP','HIERARCHYID','SQL_VARIANT','XML','GEOGRAPHY','GEOMETRY'))
+						) = 0 
+					--and (select count(*)
+					--		from sys.objects so
+					--		where UPPER(so.type) in ('PK','F','UQ','TA','TR') and parent_object_id = t.object_id ) = 0
+					--and (select count(*)
+					--		from sys.indexes ind
+					--		where t.object_id = ind.object_id
+					--			and ind.type in (3,4) ) = 0
+					--and t.is_memory_optimized = 0
+					and t.is_replicated = 0
+					and coalesce(t.filestream_data_space_id,0,1) = 0
+					and t.is_filetable = 0
+				  )
+				 or @showReadyTablesOnly = 0)
+		group by t.object_id, t.is_tracked_by_cdc, t.is_memory_optimized, t.is_filetable, t.is_replicated, t.filestream_data_space_id
+		having sum(p.rows) > @minRowsToConsider 
+				and
+				(((select sum(col.max_length) 
+					from sys.columns as col
+						inner join sys.types as tp
+							on col.system_type_id = tp.system_type_id
+					where t.object_id = col.object_id 
+				  ) < 8000 and @considerColumnsOver8K = 0 ) 
+				  OR
+				 @considerColumnsOver8K = 1 )
+				and 
+				(sum(a.total_pages) * 8.0 / 1024. / 1024 >= @minSizeToConsiderInGB)
+		order by sum(p.rows) desc, sum(a.total_pages) desc;
+
+	-- Show the found results
+	select case when ([Triggers] + [Replication] + [FileStream] + [FileTable] + [Unsupported] - ([LOBs] + [Computed])) > 0 then 'None' 
+				when ([Clustered Index] + [CDC] + [CT] +
+					  [Unique Constraints] + [Triggers] + [InMemoryOLTP] + [Replication] + [FileStream] + [FileTable] + [Unsupported] 
+					  - ([LOBs] + [Computed])) = 0 and [Unsupported] = 0 then 'Both Columnstores' 
+				when ( [Triggers] + [Replication] + [FileStream] + [FileTable] + [Unsupported] 
+					  - ([LOBs] + [Computed])) <= 0 then 'Nonclustered Columnstore'  
+		   end as 'Compatible With'
+		, [TableName], [Row Count], [Min RowGroups], [Size in GB], [Cols Count], [String Cols], [Sum Length], [Unsupported], [LOBs], [Computed]
+		, [Clustered Index], [Nonclustered Indexes], [XML Indexes], [Spatial Indexes], [Primary Key], [Foreign Keys], [Unique Constraints]
+		, [Triggers], [RCSI], [Snapshot], [CDC], [CT], [InMemoryOLTP], [Replication], [FileStream], [FileTable]
+		from #TablesToColumnstore
+		order by [Row Count] desc;
+
+	if( @showUnsupportedColumnsDetails = 1 ) 
+	begin
+		select quotename(object_schema_name(t.object_id)) + '.' + quotename(object_name (t.object_id)) as 'TableName',
+			col.name as 'Unsupported Column Name',
+			tp.name as 'Data Type',
+			col.max_length as 'Max Length',
+			col.precision as 'Precision',
+			col.is_computed as 'Computed'
+			from sys.tables t
+				inner join sys.columns as col
+					on t.object_id = col.object_id 
+				inner join sys.types as tp
+					on col.user_type_id = tp.user_type_id 
+				where  ((UPPER(tp.name) in ('TEXT','NTEXT','TIMESTAMP','HIERARCHYID','SQL_VARIANT','XML','GEOGRAPHY','GEOMETRY') OR
+						(UPPER(tp.name) in ('VARCHAR','NVARCHAR','CHAR','NCHAR') and (col.max_length = 8000 or col.max_length = -1)) 
+						) 
+						OR col.is_computed = 1 )
+				 and t.object_id in (select ObjectId from #TablesToColumnstore);
+	end
+
+	if( @showTSQLCommandsBeta = 1 ) 
+	begin
+		select coms.TableName, coms.[TSQL Command], coms.[type] 
+			from (
+				select t.TableName, 
+						'create ' + @columnstoreIndexTypeForTSQL + ' columnstore index ' + 
+						case @columnstoreIndexTypeForTSQL when 'Clustered' then 'CCI' when 'Nonclustered' then 'NCCI' end 
+						+ '_' + t.[ShortTableName] + 
+						' on ' + t.TableName + case @columnstoreIndexTypeForTSQL when 'Nonclustered' then '()' else '' end + ';' as [TSQL Command]
+					   , 'CCL' as type,
+					   101 as [Sort Order]
+					from #TablesToColumnstore t
+				union all
+				select t.TableName, 'alter table ' + t.TableName + ' drop constraint ' + (quotename(so.name) collate SQL_Latin1_General_CP1_CI_AS) + ';' as [TSQL Command], [type], 
+					   case UPPER(type) when 'PK' then 100 when 'F' then 1 when 'UQ' then 100 end as [Sort Order]
+					from #TablesToColumnstore t
+					inner join sys.objects so
+						on t.ObjectId = so.parent_object_id
+					where UPPER(type) in ('PK','F','UQ')
+				union all
+				select t.TableName, 'drop trigger ' + (quotename(so.name) collate SQL_Latin1_General_CP1_CI_AS) + ';' as [TSQL Command], type,
+					50 as [Sort Order]
+					from #TablesToColumnstore t
+					inner join sys.objects so
+						on t.ObjectId = so.parent_object_id
+					where UPPER(type) in ('TR')
+				union all
+				select t.TableName, 'drop assembly ' + (quotename(so.name) collate SQL_Latin1_General_CP1_CI_AS) + ' WITH NO DEPENDENTS ;' as [TSQL Command], type,
+					50 as [Sort Order]
+					from #TablesToColumnstore t
+					inner join sys.objects so
+						on t.ObjectId = so.parent_object_id
+					where UPPER(type) in ('TA')	
+				union all 
+				select t.TableName, 'drop index ' + (quotename(ind.name) collate SQL_Latin1_General_CP1_CI_AS) + ' on ' + t.TableName + ';' as [TSQL Command], 'CL' as type,
+					10 as [Sort Order]
+					from #TablesToColumnstore t
+					inner join sys.indexes ind
+						on t.ObjectId = ind.object_id
+					where type = 1
+				union all 
+				select t.TableName, 'drop index ' + (quotename(ind.name) collate SQL_Latin1_General_CP1_CI_AS) + ' on ' + t.TableName + ';' as [TSQL Command], 'NC' as type,
+					10 as [Sort Order]
+					from #TablesToColumnstore t
+					inner join sys.indexes ind
+						on t.ObjectId = ind.object_id
+					where type = 2
+				union all 
+				select t.TableName, 'drop index ' + (quotename(ind.name) collate SQL_Latin1_General_CP1_CI_AS) + ' on ' + t.TableName + ';' as [TSQL Command], 'XML' as type,
+					10 as [Sort Order]
+					from #TablesToColumnstore t
+					inner join sys.indexes ind
+						on t.ObjectId = ind.object_id
+					where type = 3
+				union all 
+				select t.TableName, 'drop index ' + (quotename(ind.name) collate SQL_Latin1_General_CP1_CI_AS) + ' on ' + t.TableName + ';' as [TSQL Command], 'SPAT' as type,
+					10 as [Sort Order]
+					from #TablesToColumnstore t
+					inner join sys.indexes ind
+						on t.ObjectId = ind.object_id
+					where type = 4
+				union all 
+				select t.TableName, '-- - - - - - - - - - - - - - - - - - - - - -' as [TSQL Command], '---' as type,
+					0 as [Sort Order]
+					from #TablesToColumnstore t
+			) coms
+		order by coms.type desc, coms.[Sort Order]; --coms.TableName 
+			 
+	end
+
+	drop table #TablesToColumnstore; 
+end
diff --git a/SQL-2016/suggested_tables.sql b/SQL-2016/suggested_tables.sql
index c9dc09d..fcdc57c 100644
--- a/SQL-2016/suggested_tables.sql
+++ b/SQL-2016/suggested_tables.sql
@@ -24,13 +24,16 @@
 		- CLR support is not included or tested
 		- Output [Min RowGroups] is not taking present partitions into calculations yet :)
 		- InMemory OLTP compatibility is not tested
+
+	Changes in 1.0.3
+		* Changed the name of the @tableNamePattern to @tableName to follow the same standard across all CISL functions		
 */
 
 -- Params --
 declare @minRowsToConsider bigint = 500000,							-- Minimum number of rows for a table to be considered for the suggestion inclusion
 		@minSizeToConsiderInGB Decimal(16,3) = 0.00,				-- Minimum size in GB for a table to be considered for the suggestion inclusion
 		@schemaName nvarchar(256) = NULL,							-- Allows to show data filtered down to the specified schema
-		@tableNamePattern nvarchar(256) = null,						-- Allows to show data filtered down to the specified table name pattern
+		@tableName nvarchar(256) = null,							-- Allows to show data filtered down to the specified table name pattern
 		@considerColumnsOver8K bit = 1,								-- Include in the results tables, which columns sum extends over 8000 bytes (and thus not supported in Columnstore)
 		@showReadyTablesOnly bit = 0,								-- Shows only those Rowstore tables that can already get Columnstore Index without any additional work
 		@showUnsupportedColumnsDetails bit = 0,						-- Shows a list of all Unsupported from the listed tables
@@ -189,7 +192,7 @@ select t.object_id as [ObjectId]
 				from sys.indexes ind
 				where t.object_id = ind.object_id
 					and ind.type in (5,6) ) = 0    -- Filtering out tables with existing Columnstore Indexes
-		 and (@tableNamePattern is null or object_name (t.object_id) like '%' + @tableNamePattern + '%')
+		 and (@tableName is null or object_name (t.object_id) like '%' + @tableName + '%')
 		 and (@schemaName is null or object_schema_name( t.object_id ) = @schemaName)
 		 and (( @showReadyTablesOnly = 1 
 				and