Renames and relocates functions