Rename some thing to fix paths