Merge "Unifying constant app names used in Tests" into main