Some renaming in prime-factors function