fixed names and paths