r10585: rename to more closely align with src filename