Fixed exports and ducplicate function names