cleanup: make into aliases: easy -> done, now -> by

cleanup: make into aliases: easy -> done, now -> by #2971