rename the calls too!

Signed-off-by: Suki <suki@missallsunday.com>
I dunno how this wasn't deleted already...

Signed-off-by: Suki <suki@missallsunday.com>
bye bye fugly wrappers!

Signed-off-by: Suki <suki@missallsunday.com>
Turns out this was necessary :P

Signed-off-by: Suki <suki@missallsunday.com>