Renaming require aliases to be more consistent