Citation II: renaming files in preparation for the next patch.
Authored by: lbrenta 2018-07-13
Parent: [r3327]
Child: [r3329]