new build w/ fix to naming in siteGoF