Clubhouses naming fix