30.06.13 | File names refactoring