Restore dj spock, fix naming in panic