Change File names to reflect class types