Updated source files to avoid namespace duplication

[laf]

Pre-Request Checklist

• Passes rubocop code analysis (try rubocop --auto-correct)
• Tests added or adapted (try rake test)
• Changes are reflected in the documentation
• User-visible changes appended to CHANGELOG.md

Description

This possibly fixes issue #2154. I've got a limited test environment I've run this in and without changing the config file this works ok for me.

manager.rb may need more doing to it but this worked for me.

[laf]

@robertcheramy Would you be able to review this change?

[robertcheramy]

Yes, I will look at your PR but must work on other issues and older PR first.