Fixed clashing function names