Updated unicode methods to return unicode, and altered filename to match generated id