Fixed potential naming conflicts