Changes mostly intended for Basic flavor:
But changes for necessary for full as well because view binding code is the same, so the name also needed to be spl
Same for categories: