Resolving name issues.