Fixed files names to be consistent