Remove conflicting names
Make the functions visible from python