Fix namespace inconsistencies.