Include guard lacks underscore when adding new C++ class

Steps to reproduce (on any C++ project):

1) Select File => New file => C++ Class

2) Set Class name to "FooBar", Header file to "foo_bar.hpp" and Source file to "foo_bar.cpp"

3) Finish the wizard

What happens (no underscore between FOO and BAR):

#ifndef FOOBAR_HPP
#define FOOBAR_HPP

class FooBar
{
public:
    FooBar();
};

#endif // FOOBAR_HPP

What should happen (there should be an underscore between FOO and BAR):

#ifndef FOO_BAR_HPP
#define FOO_BAR_HPP

class FooBar
{
public:
    FooBar();
};

#endif // FOO_BAR_HPP

Notice that this works correctly when the user chooses to add only a header file. The current behavior is thus also inconsistent.