Fix a few names and paths