Fixing an issue in the preprocessor that was causing bugs in auto naming.