fixed user naming conflicts