diff --git a/test/Assembler/mdcompileunit.ll b/test/Assembler/dicompileunit.ll
similarity index 100%
rename from test/Assembler/mdcompileunit.ll
rename to test/Assembler/dicompileunit.ll
diff --git a/test/Assembler/mdexpression.ll b/test/Assembler/diexpression.ll
similarity index 100%
rename from test/Assembler/mdexpression.ll
rename to test/Assembler/diexpression.ll
diff --git a/test/Assembler/mdfile-escaped-chars.ll b/test/Assembler/difile-escaped-chars.ll
similarity index 100%
rename from test/Assembler/mdfile-escaped-chars.ll
rename to test/Assembler/difile-escaped-chars.ll
diff --git a/test/Assembler/mdglobalvariable.ll b/test/Assembler/diglobalvariable.ll
similarity index 100%
rename from test/Assembler/mdglobalvariable.ll
rename to test/Assembler/diglobalvariable.ll
diff --git a/test/Assembler/mdimportedentity.ll b/test/Assembler/diimportedentity.ll
similarity index 100%
rename from test/Assembler/mdimportedentity.ll
rename to test/Assembler/diimportedentity.ll
diff --git a/test/Assembler/mdlexicalblock.ll b/test/Assembler/dilexicalblock.ll
similarity index 100%
rename from test/Assembler/mdlexicalblock.ll
rename to test/Assembler/dilexicalblock.ll
diff --git a/test/Assembler/mdlocalvariable.ll b/test/Assembler/dilocalvariable.ll
similarity index 100%
rename from test/Assembler/mdlocalvariable.ll
rename to test/Assembler/dilocalvariable.ll
diff --git a/test/Assembler/mdlocation.ll b/test/Assembler/dilocation.ll
similarity index 100%
rename from test/Assembler/mdlocation.ll
rename to test/Assembler/dilocation.ll
diff --git a/test/Assembler/mdnamespace.ll b/test/Assembler/dinamespace.ll
similarity index 100%
rename from test/Assembler/mdnamespace.ll
rename to test/Assembler/dinamespace.ll
diff --git a/test/Assembler/mdobjcproperty.ll b/test/Assembler/diobjcproperty.ll
similarity index 100%
rename from test/Assembler/mdobjcproperty.ll
rename to test/Assembler/diobjcproperty.ll
diff --git a/test/Assembler/mdsubprogram.ll b/test/Assembler/disubprogram.ll
similarity index 100%
rename from test/Assembler/mdsubprogram.ll
rename to test/Assembler/disubprogram.ll
diff --git a/test/Assembler/mdsubrange-empty-array.ll b/test/Assembler/disubrange-empty-array.ll
similarity index 100%
rename from test/Assembler/mdsubrange-empty-array.ll
rename to test/Assembler/disubrange-empty-array.ll
diff --git a/test/Assembler/mdsubroutinetype.ll b/test/Assembler/disubroutinetype.ll
similarity index 100%
rename from test/Assembler/mdsubroutinetype.ll
rename to test/Assembler/disubroutinetype.ll
diff --git a/test/Assembler/mdtemplateparameter.ll b/test/Assembler/ditemplateparameter.ll
similarity index 100%
rename from test/Assembler/mdtemplateparameter.ll
rename to test/Assembler/ditemplateparameter.ll
diff --git a/test/Assembler/mdtype-large-values.ll b/test/Assembler/ditype-large-values.ll
similarity index 100%
rename from test/Assembler/mdtype-large-values.ll
rename to test/Assembler/ditype-large-values.ll
diff --git a/test/Assembler/invalid-mdcompileunit-language-bad.ll b/test/Assembler/invalid-dicompileunit-language-bad.ll
similarity index 100%
rename from test/Assembler/invalid-mdcompileunit-language-bad.ll
rename to test/Assembler/invalid-dicompileunit-language-bad.ll
diff --git a/test/Assembler/invalid-mdcompileunit-language-overflow.ll b/test/Assembler/invalid-dicompileunit-language-overflow.ll
similarity index 100%
rename from test/Assembler/invalid-mdcompileunit-language-overflow.ll
rename to test/Assembler/invalid-dicompileunit-language-overflow.ll
diff --git a/test/Assembler/invalid-mdcompileunit-missing-language.ll b/test/Assembler/invalid-dicompileunit-missing-language.ll
similarity index 100%
rename from test/Assembler/invalid-mdcompileunit-missing-language.ll
rename to test/Assembler/invalid-dicompileunit-missing-language.ll
diff --git a/test/Assembler/invalid-mdcompileunit-null-file.ll b/test/Assembler/invalid-dicompileunit-null-file.ll
similarity index 100%
rename from test/Assembler/invalid-mdcompileunit-null-file.ll
rename to test/Assembler/invalid-dicompileunit-null-file.ll
diff --git a/test/Assembler/invalid-mdcompositetype-missing-tag.ll b/test/Assembler/invalid-dicompositetype-missing-tag.ll
similarity index 100%
rename from test/Assembler/invalid-mdcompositetype-missing-tag.ll
rename to test/Assembler/invalid-dicompositetype-missing-tag.ll
diff --git a/test/Assembler/invalid-mdderivedtype-missing-basetype.ll b/test/Assembler/invalid-diderivedtype-missing-basetype.ll
similarity index 100%
rename from test/Assembler/invalid-mdderivedtype-missing-basetype.ll
rename to test/Assembler/invalid-diderivedtype-missing-basetype.ll
diff --git a/test/Assembler/invalid-mdderivedtype-missing-tag.ll b/test/Assembler/invalid-diderivedtype-missing-tag.ll
similarity index 100%
rename from test/Assembler/invalid-mdderivedtype-missing-tag.ll
rename to test/Assembler/invalid-diderivedtype-missing-tag.ll
diff --git a/test/Assembler/invalid-mdenumerator-missing-name.ll b/test/Assembler/invalid-dienumerator-missing-name.ll
similarity index 100%
rename from test/Assembler/invalid-mdenumerator-missing-name.ll
rename to test/Assembler/invalid-dienumerator-missing-name.ll
diff --git a/test/Assembler/invalid-mdenumerator-missing-value.ll b/test/Assembler/invalid-dienumerator-missing-value.ll
similarity index 100%
rename from test/Assembler/invalid-mdenumerator-missing-value.ll
rename to test/Assembler/invalid-dienumerator-missing-value.ll
diff --git a/test/Assembler/invalid-mdexpression-large.ll b/test/Assembler/invalid-diexpression-large.ll
similarity index 100%
rename from test/Assembler/invalid-mdexpression-large.ll
rename to test/Assembler/invalid-diexpression-large.ll
diff --git a/test/Assembler/invalid-mdexpression-verify.ll b/test/Assembler/invalid-diexpression-verify.ll
similarity index 100%
rename from test/Assembler/invalid-mdexpression-verify.ll
rename to test/Assembler/invalid-diexpression-verify.ll
diff --git a/test/Assembler/invalid-mdfile-missing-directory.ll b/test/Assembler/invalid-difile-missing-directory.ll
similarity index 100%
rename from test/Assembler/invalid-mdfile-missing-directory.ll
rename to test/Assembler/invalid-difile-missing-directory.ll
diff --git a/test/Assembler/invalid-mdfile-missing-filename.ll b/test/Assembler/invalid-difile-missing-filename.ll
similarity index 100%
rename from test/Assembler/invalid-mdfile-missing-filename.ll
rename to test/Assembler/invalid-difile-missing-filename.ll
diff --git a/test/Assembler/invalid-mdglobalvariable-empty-name.ll b/test/Assembler/invalid-diglobalvariable-empty-name.ll
similarity index 100%
rename from test/Assembler/invalid-mdglobalvariable-empty-name.ll
rename to test/Assembler/invalid-diglobalvariable-empty-name.ll
diff --git a/test/Assembler/invalid-mdglobalvariable-missing-name.ll b/test/Assembler/invalid-diglobalvariable-missing-name.ll
similarity index 100%
rename from test/Assembler/invalid-mdglobalvariable-missing-name.ll
rename to test/Assembler/invalid-diglobalvariable-missing-name.ll
diff --git a/test/Assembler/invalid-mdimportedentity-missing-scope.ll b/test/Assembler/invalid-diimportedentity-missing-scope.ll
similarity index 100%
rename from test/Assembler/invalid-mdimportedentity-missing-scope.ll
rename to test/Assembler/invalid-diimportedentity-missing-scope.ll
diff --git a/test/Assembler/invalid-mdimportedentity-missing-tag.ll b/test/Assembler/invalid-diimportedentity-missing-tag.ll
similarity index 100%
rename from test/Assembler/invalid-mdimportedentity-missing-tag.ll
rename to test/Assembler/invalid-diimportedentity-missing-tag.ll
diff --git a/test/Assembler/invalid-mdlexicalblock-missing-scope.ll b/test/Assembler/invalid-dilexicalblock-missing-scope.ll
similarity index 100%
rename from test/Assembler/invalid-mdlexicalblock-missing-scope.ll
rename to test/Assembler/invalid-dilexicalblock-missing-scope.ll
diff --git a/test/Assembler/invalid-mdlexicalblock-null-scope.ll b/test/Assembler/invalid-dilexicalblock-null-scope.ll
similarity index 100%
rename from test/Assembler/invalid-mdlexicalblock-null-scope.ll
rename to test/Assembler/invalid-dilexicalblock-null-scope.ll
diff --git a/test/Assembler/invalid-mdlexicalblockfile-missing-discriminator.ll b/test/Assembler/invalid-dilexicalblockfile-missing-discriminator.ll
similarity index 100%
rename from test/Assembler/invalid-mdlexicalblockfile-missing-discriminator.ll
rename to test/Assembler/invalid-dilexicalblockfile-missing-discriminator.ll
diff --git a/test/Assembler/invalid-mdlexicalblockfile-missing-scope.ll b/test/Assembler/invalid-dilexicalblockfile-missing-scope.ll
similarity index 100%
rename from test/Assembler/invalid-mdlexicalblockfile-missing-scope.ll
rename to test/Assembler/invalid-dilexicalblockfile-missing-scope.ll
diff --git a/test/Assembler/invalid-mdlexicalblockfile-null-scope.ll b/test/Assembler/invalid-dilexicalblockfile-null-scope.ll
similarity index 100%
rename from test/Assembler/invalid-mdlexicalblockfile-null-scope.ll
rename to test/Assembler/invalid-dilexicalblockfile-null-scope.ll
diff --git a/test/Assembler/invalid-mdlocalvariable-missing-scope.ll b/test/Assembler/invalid-dilocalvariable-missing-scope.ll
similarity index 100%
rename from test/Assembler/invalid-mdlocalvariable-missing-scope.ll
rename to test/Assembler/invalid-dilocalvariable-missing-scope.ll
diff --git a/test/Assembler/invalid-mdlocalvariable-missing-tag.ll b/test/Assembler/invalid-dilocalvariable-missing-tag.ll
similarity index 100%
rename from test/Assembler/invalid-mdlocalvariable-missing-tag.ll
rename to test/Assembler/invalid-dilocalvariable-missing-tag.ll
diff --git a/test/Assembler/invalid-mdlocalvariable-null-scope.ll b/test/Assembler/invalid-dilocalvariable-null-scope.ll
similarity index 100%
rename from test/Assembler/invalid-mdlocalvariable-null-scope.ll
rename to test/Assembler/invalid-dilocalvariable-null-scope.ll
diff --git a/test/Assembler/invalid-mdlocation-field-bad.ll b/test/Assembler/invalid-dilocation-field-bad.ll
similarity index 100%
rename from test/Assembler/invalid-mdlocation-field-bad.ll
rename to test/Assembler/invalid-dilocation-field-bad.ll
diff --git a/test/Assembler/invalid-mdlocation-field-twice.ll b/test/Assembler/invalid-dilocation-field-twice.ll
similarity index 100%
rename from test/Assembler/invalid-mdlocation-field-twice.ll
rename to test/Assembler/invalid-dilocation-field-twice.ll
diff --git a/test/Assembler/invalid-mdlocation-missing-scope-2.ll b/test/Assembler/invalid-dilocation-missing-scope-2.ll
similarity index 100%
rename from test/Assembler/invalid-mdlocation-missing-scope-2.ll
rename to test/Assembler/invalid-dilocation-missing-scope-2.ll
diff --git a/test/Assembler/invalid-mdlocation-missing-scope.ll b/test/Assembler/invalid-dilocation-missing-scope.ll
similarity index 100%
rename from test/Assembler/invalid-mdlocation-missing-scope.ll
rename to test/Assembler/invalid-dilocation-missing-scope.ll
diff --git a/test/Assembler/invalid-mdlocation-null-scope.ll b/test/Assembler/invalid-dilocation-null-scope.ll
similarity index 100%
rename from test/Assembler/invalid-mdlocation-null-scope.ll
rename to test/Assembler/invalid-dilocation-null-scope.ll
diff --git a/test/Assembler/invalid-mdlocation-overflow-column.ll b/test/Assembler/invalid-dilocation-overflow-column.ll
similarity index 100%
rename from test/Assembler/invalid-mdlocation-overflow-column.ll
rename to test/Assembler/invalid-dilocation-overflow-column.ll
diff --git a/test/Assembler/invalid-mdlocation-overflow-line.ll b/test/Assembler/invalid-dilocation-overflow-line.ll
similarity index 100%
rename from test/Assembler/invalid-mdlocation-overflow-line.ll
rename to test/Assembler/invalid-dilocation-overflow-line.ll
diff --git a/test/Assembler/invalid-mdnamespace-missing-namespace.ll b/test/Assembler/invalid-dinamespace-missing-namespace.ll
similarity index 100%
rename from test/Assembler/invalid-mdnamespace-missing-namespace.ll
rename to test/Assembler/invalid-dinamespace-missing-namespace.ll
diff --git a/test/Assembler/invalid-mdsubrange-count-large.ll b/test/Assembler/invalid-disubrange-count-large.ll
similarity index 100%
rename from test/Assembler/invalid-mdsubrange-count-large.ll
rename to test/Assembler/invalid-disubrange-count-large.ll
diff --git a/test/Assembler/invalid-mdsubrange-count-missing.ll b/test/Assembler/invalid-disubrange-count-missing.ll
similarity index 100%
rename from test/Assembler/invalid-mdsubrange-count-missing.ll
rename to test/Assembler/invalid-disubrange-count-missing.ll
diff --git a/test/Assembler/invalid-mdsubrange-count-negative.ll b/test/Assembler/invalid-disubrange-count-negative.ll
similarity index 100%
rename from test/Assembler/invalid-mdsubrange-count-negative.ll
rename to test/Assembler/invalid-disubrange-count-negative.ll
diff --git a/test/Assembler/invalid-mdsubrange-lowerBound-max.ll b/test/Assembler/invalid-disubrange-lowerBound-max.ll
similarity index 100%
rename from test/Assembler/invalid-mdsubrange-lowerBound-max.ll
rename to test/Assembler/invalid-disubrange-lowerBound-max.ll
diff --git a/test/Assembler/invalid-mdsubrange-lowerBound-min.ll b/test/Assembler/invalid-disubrange-lowerBound-min.ll
similarity index 100%
rename from test/Assembler/invalid-mdsubrange-lowerBound-min.ll
rename to test/Assembler/invalid-disubrange-lowerBound-min.ll
diff --git a/test/Assembler/invalid-mdsubroutinetype-missing-types.ll b/test/Assembler/invalid-disubroutinetype-missing-types.ll
similarity index 100%
rename from test/Assembler/invalid-mdsubroutinetype-missing-types.ll
rename to test/Assembler/invalid-disubroutinetype-missing-types.ll
diff --git a/test/Assembler/invalid-mdtemplatetypeparameter-missing-type.ll b/test/Assembler/invalid-ditemplatetypeparameter-missing-type.ll
similarity index 100%
rename from test/Assembler/invalid-mdtemplatetypeparameter-missing-type.ll
rename to test/Assembler/invalid-ditemplatetypeparameter-missing-type.ll
diff --git a/test/Assembler/invalid-mdtemplatevalueparameter-missing-value.ll b/test/Assembler/invalid-ditemplatevalueparameter-missing-value.ll
similarity index 100%
rename from test/Assembler/invalid-mdtemplatevalueparameter-missing-value.ll
rename to test/Assembler/invalid-ditemplatevalueparameter-missing-value.ll