Function renaming. Solves some namespace conflicts