Added class to replace the replace_name function