Also rename the file to match the example being extended. (cherry picked from commit 55ac274e) (cherry picked from commit d1612a71) (cherry picked from commit 6703b380)