Refactoring NCIP.pm slightly, dealing with namespaces more elegantly
(cherry picked from commit f438d2b36253e97f1f6704d75caf3ef0b53c985b)