updated class names to core_firewall