I think it's a great idea to change the names to promote the safe versions.