Changed file names
Misc update