improve site definition default naming