Clean up language distinction between resource and item.