namespace discrepancies fixed