Updating namespace

Updated namespaces to complete merge with david's commit.