Fix duplication issues.
More tweak to naming