Sounds reasonable. I'll keep these names then, and just clarify some things in javadoc.