Index: /branches/release-38/lib/MT/ObjectTag.pm
===================================================================
--- /branches/release-38/lib/MT/ObjectTag.pm (revision 1609)
+++ /branches/release-38/lib/MT/ObjectTag.pm (revision 2369)
@@ -29,5 +29,5 @@
         },
         # For tag count
-        blog_ds_object_tag => {
+        blog_ds_obj_tag => {
             columns => ['blog_id', 'object_datasource', 'object_id', 'tag_id'],
         },
Index: /branches/release-38/lib/MT/Object.pm
===================================================================
--- /branches/release-38/lib/MT/Object.pm (revision 2353)
+++ /branches/release-38/lib/MT/Object.pm (revision 2369)
@@ -474,11 +474,11 @@
             type              => 'string(75) not null',
             vchar             => 'string(255)',
-            vchar_indexed     => 'string(255)',
+            vchar_idx         => 'string(255)',
             vdatetime         => 'datetime',
-            vdatetime_indexed => 'datetime',
+            vdatetime_idx     => 'datetime',
             vinteger          => 'integer',
-            vinteger_indexed  => 'integer',
+            vinteger_idx      => 'integer',
             vfloat            => 'float',
-            vfloat_indexed    => 'float',
+            vfloat_idx        => 'float',
             vblob             => 'blob',
             vclob             => 'text',
@@ -487,11 +487,11 @@
             type
             vchar
-            vchar_indexed
+            vchar_idx
             vdatetime
-            vdatetime_indexed
+            vdatetime_idx
             vinteger
-            vinteger_indexed
+            vinteger_idx
             vfloat
-            vfloat_indexed
+            vfloat_idx
             vblob
             vclob
@@ -500,11 +500,11 @@
             $id_field => 1,
             id_type   => { columns => [ $id_field, 'type' ] },
-            id_type_vchar => { columns => [ $id_field, 'type', 'vchar_indexed' ] },
-            id_type_vdatetime => { columns => [ $id_field, 'type',
-                'vdatetime_indexed' ] },
-            id_type_vinteger => { columns => [ $id_field, 'type',
-                'vinteger_indexed' ] },
-            id_type_vfloat => { columns => [ $id_field, 'type',
-                'vfloat_indexed' ] },
+            id_type_vchar => { columns => [ $id_field, 'type', 'vchar_idx' ] },
+            id_type_vdt => { columns => [ $id_field, 'type',
+                'vdatetime_idx' ] },
+            id_type_vint => { columns => [ $id_field, 'type',
+                'vinteger_idx' ] },
+            id_type_vflt => { columns => [ $id_field, 'type',
+                'vfloat_idx' ] },
         },
         primary_key => [ $id_field, 'type' ],
@@ -2378,5 +2378,5 @@
 
 In this form, the storage type is explicitly declared, so the metadata
-is stored into the appropriate column (vinteger_indexed and vchar_indexed
+is stored into the appropriate column (vinteger_idx and vchar_idx
 respectively).
 
Index: /branches/release-38/lib/MT/Meta.pm
===================================================================
--- /branches/release-38/lib/MT/Meta.pm (revision 2281)
+++ /branches/release-38/lib/MT/Meta.pm (revision 2369)
@@ -36,11 +36,11 @@
     %Types = (
         TYPE_VCHAR()             => "vchar",
-        TYPE_VCHAR_INDEXED()     => "vchar_indexed",
+        TYPE_VCHAR_INDEXED()     => "vchar_idx",
         TYPE_VINTEGER()          => "vinteger",
-        TYPE_VINTEGER_INDEXED()  => "vinteger_indexed",
+        TYPE_VINTEGER_INDEXED()  => "vinteger_idx",
         TYPE_VDATETIME()         => "vdatetime",
-        TYPE_VDATETIME_INDEXED() => "vdatetime_indexed",
+        TYPE_VDATETIME_INDEXED() => "vdatetime_idx",
         TYPE_VFLOAT()            => "vfloat",
-        TYPE_VFLOAT_INDEXED()    => "vfloat_indexed",
+        TYPE_VFLOAT_INDEXED()    => "vfloat_idx",
         TYPE_VBLOB()             => "vblob",
         TYPE_VCLOB()             => "vclob",
@@ -70,5 +70,5 @@
 ##         id      => 123,
 ##         type_id => 1,
-##         type    => 'vchar_indexed',
+##         type    => 'vchar_idx',
 ##         pkg     => 'MT::Foo',
 ##         zip     => $cfg,   ## optional
@@ -318,5 +318,5 @@
 =item * type
 
-The data type of the metadata field. One of: C<vchar>, C<vchar_indexed>, or
+The data type of the metadata field. One of: C<vchar>, C<vchar_idx>, or
 C<vblob>.
 
@@ -386,5 +386,5 @@
 =item * type
 
-The data type of the metadata field. One of: C<vchar>, C<vchar_indexed>, or
+The data type of the metadata field. One of: C<vchar>, C<vchar_idx>, or
 C<vblob>.