CISCONAED-1 - Refactored activity keys