[Delivers #48201441] Update comments and variable names for consistency