LPS-40882 - Applying pattern to other files