new build w/ fix to naming issue in SiteGoF