Rename function, remove old version references