diff --git a/packages/yonode-templates/JS-MongoDB-Mongoose-NoAuth-Template b/packages/yonode-templates/JS-MongoDB-Mongoose-NoAuth
similarity index 100%
rename from packages/yonode-templates/JS-MongoDB-Mongoose-NoAuth-Template
rename to packages/yonode-templates/JS-MongoDB-Mongoose-NoAuth
diff --git a/packages/yonode-templates/JS-MongoDB-Prisma-NoAuth-Template b/packages/yonode-templates/JS-MongoDB-Prisma-NoAuth
similarity index 100%
rename from packages/yonode-templates/JS-MongoDB-Prisma-NoAuth-Template
rename to packages/yonode-templates/JS-MongoDB-Prisma-NoAuth
diff --git a/packages/yonode-templates/JS-MongoDB-TypeORM-NoAuth-Template b/packages/yonode-templates/JS-MongoDB-TypeORM-NoAuth
similarity index 100%
rename from packages/yonode-templates/JS-MongoDB-TypeORM-NoAuth-Template
rename to packages/yonode-templates/JS-MongoDB-TypeORM-NoAuth
diff --git a/packages/yonode-templates/JS-MySQL-Prisma-NoAuth-Template b/packages/yonode-templates/JS-MySQL-Prisma-NoAuth
similarity index 100%
rename from packages/yonode-templates/JS-MySQL-Prisma-NoAuth-Template
rename to packages/yonode-templates/JS-MySQL-Prisma-NoAuth
diff --git a/packages/yonode-templates/JS-MySQL-Sequelize-NoAuth-Template b/packages/yonode-templates/JS-MySQL-Sequelize-NoAuth
similarity index 100%
rename from packages/yonode-templates/JS-MySQL-Sequelize-NoAuth-Template
rename to packages/yonode-templates/JS-MySQL-Sequelize-NoAuth
diff --git a/packages/yonode-templates/JS-MySQL-TypeORM-NoAuth-Template b/packages/yonode-templates/JS-MySQL-TypeORM-NoAuth
similarity index 100%
rename from packages/yonode-templates/JS-MySQL-TypeORM-NoAuth-Template
rename to packages/yonode-templates/JS-MySQL-TypeORM-NoAuth
diff --git a/packages/yonode-templates/JS-PostgreSQL-Prisma-NoAuth-Template b/packages/yonode-templates/JS-PostgreSQL-Prisma-NoAuth
similarity index 100%
rename from packages/yonode-templates/JS-PostgreSQL-Prisma-NoAuth-Template
rename to packages/yonode-templates/JS-PostgreSQL-Prisma-NoAuth
diff --git a/packages/yonode-templates/JS-PostgreSQL-Sequelize-NoAuth-Template b/packages/yonode-templates/JS-PostgreSQL-Sequelize-NoAuth
similarity index 100%
rename from packages/yonode-templates/JS-PostgreSQL-Sequelize-NoAuth-Template
rename to packages/yonode-templates/JS-PostgreSQL-Sequelize-NoAuth
diff --git a/packages/yonode-templates/JS-PostgreSQL-TypeORM-NoAuth-Template b/packages/yonode-templates/JS-PostgreSQL-TypeORM-NoAuth
similarity index 100%
rename from packages/yonode-templates/JS-PostgreSQL-TypeORM-NoAuth-Template
rename to packages/yonode-templates/JS-PostgreSQL-TypeORM-NoAuth