Revert "Revert "Rename folder Validation""

This reverts commit c66906137fc5f76842c2d3bf16bfb94f1e21085a.