merge filenames with master.

So i make merging with master.
Tested on Linux.
Still not sure about Lua.