Rename back; fix catch-all rule