Fix filter and handle to for consistent naming