I think those are good naming suggestions. I was following the tense used in the existing clauses, but I'll change my new ones.