ADDED replace_with_name