changed names and updated files