Back to "gcc" instead of "g++" in the naming convention.