CMS-2972 Improve api.util.Loader
Renamed generic templates in BaseLoader