CMS-4396 Replace AccoutKey with PrincipalKey. Fixed modules.