Use reference resolver strategy name.
Clean up primitives