updated names and paths