Support name other than basename of cwd