Gave a bunch of defaults a better name