Renaming a few internal methods, no behavioral changes