Renamed functions and added prefix to module