modified names and paths