[#65282966] Adopt refined naming convention.