Renaming of tests and constants to fit ScreenProtection better