I tried to separate the still-to-be-renamed functions in the header files, to make them a bit more easy to spot. I expected some help once it's merged... I'll try to make then disappear before.