I agree, but if we are switching to a card layout I think using terms associated with that concept gives a stronger mental model when reading the code. I'm ok with it being left as is.