Merge "Use correct name of reclass custom state"