Updated name to be more consistent