Corrected remaining namespaces changes.