Marlin firmware: Switched HBP/fan

So i've been working on 3 different projects at the same time, and i finally have one near completion. I have a Rigidbot big that i did an entire brain transplant on, using a Sainsmart 2 in 1 board. I've gotten the stepper motors running in the correct directions, endstops working, thermistors working, even the hotend. However, i have run into the slight issue that the port for the HBP is currently controlled by the fan input, and the Extruder 2 output is controlled by the HBP input. So in short

1. I entered BOARD_RAMPS_13_EFB as my selected motherboard on the Rigidbot mod Marlin firmware. What does this select as my board?

2. How do i change the outputs to reflect the inputs (HBP=HBP, not HBP=fan)