Using new files & names
Merge pull request #2 from aliaksandr-andrashuk/master

Using new files & names