Data naming unification.
Removed files.