Naming util changed to have dispatch methods.