Changed file names to match project