Update PhoneClean for new naming conventions
Merge pull request #1592 from Cottser/phoneclean

Update PhoneClean for new naming conventions