Fix a naming inconsistency for modules in src/sidebar/util where some
had a `-util` suffix and some did not.