fixed more global naming errors