Change file names to make it more consistent and to avoid conflict