renaming in dft, dft/tests. Added new tests.
Merge remote-tracking branch 'github/rename' into rename