Continuation of commit #1416925
Renaming...