Cleanup RenameWidget split, add ParserWidget