Fix inconsistent namespace usage