Quick fix for full names of base modules