Fix silly names for include files