- Fix files naming convention