Fixed potential name conflict