Fixing paths and names