Fixed naming conventions of files
Some unknown changes (HY)