fixed global naming issue