Name logic

* Converted file names into human-friendly logic