Resolving these naming issues.