Rename and generalize.