Updated to match the new clarity module names