[FIX] all modules: fix categories and module names