Rename function removing the unnecessary string name part