Fix namespace resolution.