[IMP] Better naming for reporting + removing useless context in reporting views