Rename variable and fix closing of private channels