changed name back as it did not resolve the conflict