Eliminating _ in header file