Fix path
Fix target file
Fix namespace