Rename some files according to coding style