Finished the naming changes

s/Rapid_Bunker/Bunker/