Major renaming of the security context classes