Merge "Standardize screenshot naming scheme"