Fixed bugs in how the base class file names were being generated.