DF-3475 fastname fixes related to review