Fixes #5023 Convert all modules to use new snippet import pattern