rename class name
CAAERS-6677 CAAERS-6722 CAAERS-6723 handle non-device attributions in E2B