diff --git a/v2/module/builtin/templates/legacy_index.go.tpl b/v2/module/builtin/templates/legacy_index.go.tpl
index 05f47ae..bd3ad40 100644
--- a/v2/module/builtin/templates/legacy_index.go.tpl
+++ b/v2/module/builtin/templates/legacy_index.go.tpl
@@ -103,7 +103,7 @@ func Find{{ .LegacyFuncName }}(ctx context.Context, db YODB{{ goParams .Fields t
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index '{{ .IndexName }}'.
+// Generated from index '{{ .IndexName }}'.
 func Read{{ .LegacyFuncName }}(ctx context.Context, db YODB, keys spanner.KeySet) ([]*{{ .Type.Name }}, error) {
 	var res []*{{ .Type.Name }}
     columns := []string{
diff --git a/v2/test/testmodels/legacy_default/composite_primary_key.yo.go b/v2/test/testmodels/legacy_default/composite_primary_key.yo.go
index 6db3b72..f9c40f4 100644
--- a/v2/test/testmodels/legacy_default/composite_primary_key.yo.go
+++ b/v2/test/testmodels/legacy_default/composite_primary_key.yo.go
@@ -259,7 +259,7 @@ func FindCompositePrimaryKeysByError(ctx context.Context, db YODB, e int64) ([]*
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'CompositePrimaryKeysByError'.
+// Generated from index 'CompositePrimaryKeysByError'.
 func ReadCompositePrimaryKeysByError(ctx context.Context, db YODB, keys spanner.KeySet) ([]*CompositePrimaryKey, error) {
 	var res []*CompositePrimaryKey
 	columns := []string{
@@ -334,7 +334,7 @@ func FindCompositePrimaryKeysByZError(ctx context.Context, db YODB, e int64) ([]
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'CompositePrimaryKeysByError2'.
+// Generated from index 'CompositePrimaryKeysByError2'.
 func ReadCompositePrimaryKeysByZError(ctx context.Context, db YODB, keys spanner.KeySet) ([]*CompositePrimaryKey, error) {
 	var res []*CompositePrimaryKey
 	columns := []string{
@@ -410,7 +410,7 @@ func FindCompositePrimaryKeysByZYError(ctx context.Context, db YODB, e int64) ([
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'CompositePrimaryKeysByError3'.
+// Generated from index 'CompositePrimaryKeysByError3'.
 func ReadCompositePrimaryKeysByZYError(ctx context.Context, db YODB, keys spanner.KeySet) ([]*CompositePrimaryKey, error) {
 	var res []*CompositePrimaryKey
 	columns := []string{
@@ -488,7 +488,7 @@ func FindCompositePrimaryKeysByXY(ctx context.Context, db YODB, x string, y stri
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'CompositePrimaryKeysByXY'.
+// Generated from index 'CompositePrimaryKeysByXY'.
 func ReadCompositePrimaryKeysByXY(ctx context.Context, db YODB, keys spanner.KeySet) ([]*CompositePrimaryKey, error) {
 	var res []*CompositePrimaryKey
 	columns := []string{
diff --git a/v2/test/testmodels/legacy_default/custom_composite_primary_key.yo.go b/v2/test/testmodels/legacy_default/custom_composite_primary_key.yo.go
index 6a2932a..3825d04 100644
--- a/v2/test/testmodels/legacy_default/custom_composite_primary_key.yo.go
+++ b/v2/test/testmodels/legacy_default/custom_composite_primary_key.yo.go
@@ -259,7 +259,7 @@ func FindCustomCompositePrimaryKeysByError(ctx context.Context, db YODB, e int8)
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'CustomCompositePrimaryKeysByError'.
+// Generated from index 'CustomCompositePrimaryKeysByError'.
 func ReadCustomCompositePrimaryKeysByError(ctx context.Context, db YODB, keys spanner.KeySet) ([]*CustomCompositePrimaryKey, error) {
 	var res []*CustomCompositePrimaryKey
 	columns := []string{
@@ -334,7 +334,7 @@ func FindCustomCompositePrimaryKeysByZError(ctx context.Context, db YODB, e int8
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'CustomCompositePrimaryKeysByError2'.
+// Generated from index 'CustomCompositePrimaryKeysByError2'.
 func ReadCustomCompositePrimaryKeysByZError(ctx context.Context, db YODB, keys spanner.KeySet) ([]*CustomCompositePrimaryKey, error) {
 	var res []*CustomCompositePrimaryKey
 	columns := []string{
@@ -410,7 +410,7 @@ func FindCustomCompositePrimaryKeysByZYError(ctx context.Context, db YODB, e int
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'CustomCompositePrimaryKeysByError3'.
+// Generated from index 'CustomCompositePrimaryKeysByError3'.
 func ReadCustomCompositePrimaryKeysByZYError(ctx context.Context, db YODB, keys spanner.KeySet) ([]*CustomCompositePrimaryKey, error) {
 	var res []*CustomCompositePrimaryKey
 	columns := []string{
@@ -488,7 +488,7 @@ func FindCustomCompositePrimaryKeysByXY(ctx context.Context, db YODB, x string,
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'CustomCompositePrimaryKeysByXY'.
+// Generated from index 'CustomCompositePrimaryKeysByXY'.
 func ReadCustomCompositePrimaryKeysByXY(ctx context.Context, db YODB, keys spanner.KeySet) ([]*CustomCompositePrimaryKey, error) {
 	var res []*CustomCompositePrimaryKey
 	columns := []string{
diff --git a/v2/test/testmodels/legacy_default/full_type.yo.go b/v2/test/testmodels/legacy_default/full_type.yo.go
index 3e9a9ed..45b4331 100644
--- a/v2/test/testmodels/legacy_default/full_type.yo.go
+++ b/v2/test/testmodels/legacy_default/full_type.yo.go
@@ -440,7 +440,7 @@ func FindFullTypeByFTString(ctx context.Context, db YODB, fTString string) (*Ful
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'FullTypesByFTString'.
+// Generated from index 'FullTypesByFTString'.
 func ReadFullTypeByFTString(ctx context.Context, db YODB, keys spanner.KeySet) ([]*FullType, error) {
 	var res []*FullType
 	columns := []string{
@@ -523,7 +523,7 @@ func FindFullTypesByFTIntFTTimestampNull(ctx context.Context, db YODB, fTInt int
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'FullTypesByInTimestampNull'.
+// Generated from index 'FullTypesByInTimestampNull'.
 func ReadFullTypesByFTIntFTTimestampNull(ctx context.Context, db YODB, keys spanner.KeySet) ([]*FullType, error) {
 	var res []*FullType
 	columns := []string{
@@ -599,7 +599,7 @@ func FindFullTypesByFTIntFTDate(ctx context.Context, db YODB, fTInt int64, fTDat
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'FullTypesByIntDate'.
+// Generated from index 'FullTypesByIntDate'.
 func ReadFullTypesByFTIntFTDate(ctx context.Context, db YODB, keys spanner.KeySet) ([]*FullType, error) {
 	var res []*FullType
 	columns := []string{
@@ -675,7 +675,7 @@ func FindFullTypesByFTIntFTTimestamp(ctx context.Context, db YODB, fTInt int64,
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'FullTypesByIntTimestamp'.
+// Generated from index 'FullTypesByIntTimestamp'.
 func ReadFullTypesByFTIntFTTimestamp(ctx context.Context, db YODB, keys spanner.KeySet) ([]*FullType, error) {
 	var res []*FullType
 	columns := []string{
@@ -750,7 +750,7 @@ func FindFullTypesByFTTimestamp(ctx context.Context, db YODB, fTTimestamp time.T
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'FullTypesByTimestamp'.
+// Generated from index 'FullTypesByTimestamp'.
 func ReadFullTypesByFTTimestamp(ctx context.Context, db YODB, keys spanner.KeySet) ([]*FullType, error) {
 	var res []*FullType
 	columns := []string{
diff --git a/v2/test/testmodels/legacy_default/snake_case.yo.go b/v2/test/testmodels/legacy_default/snake_case.yo.go
index 1756049..5b04bf0 100644
--- a/v2/test/testmodels/legacy_default/snake_case.yo.go
+++ b/v2/test/testmodels/legacy_default/snake_case.yo.go
@@ -231,7 +231,7 @@ func FindSnakeCasesByStringIDFooBarBaz(ctx context.Context, db YODB, stringID st
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'snake_cases_by_string_id'.
+// Generated from index 'snake_cases_by_string_id'.
 func ReadSnakeCasesByStringIDFooBarBaz(ctx context.Context, db YODB, keys spanner.KeySet) ([]*SnakeCase, error) {
 	var res []*SnakeCase
 	columns := []string{
diff --git a/v2/test/testmodels/legacy_default/uuid_type.yo.go b/v2/test/testmodels/legacy_default/uuid_type.yo.go
index b673b44..07b65d4 100644
--- a/v2/test/testmodels/legacy_default/uuid_type.yo.go
+++ b/v2/test/testmodels/legacy_default/uuid_type.yo.go
@@ -237,7 +237,7 @@ func FindUUIDTypeByName(ctx context.Context, db YODB, name string) (*UUIDType, e
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'UuidTypesByName'.
+// Generated from index 'UuidTypesByName'.
 func ReadUUIDTypeByName(ctx context.Context, db YODB, keys spanner.KeySet) ([]*UUIDType, error) {
 	var res []*UUIDType
 	columns := []string{
@@ -318,7 +318,7 @@ func FindUUIDTypesByOptionalID(ctx context.Context, db YODB, optionalID spanner.
 // used for primary key, index key and storing columns. If you need more columns, add storing
 // columns or Read by primary key or Query with join.
 //
-// Generated from unique index 'UuidTypesByOptionalID'.
+// Generated from index 'UuidTypesByOptionalID'.
 func ReadUUIDTypesByOptionalID(ctx context.Context, db YODB, keys spanner.KeySet) ([]*UUIDType, error) {
 	var res []*UUIDType
 	columns := []string{