More namespace bugs fixed
Fixed: Numerous typos due rename/namespace fixes