Fix ns expression, rename some of the components.