FIX - Site->name not referenced correctly