More consistent naming for all bundles/modules