global names fixes