Issue #2127655 by Mile23: Name space corrections