Rewriting collection naming and filters