Cleanup
Rename <runtime> to <filter>