Change file names to better match usage