Updated version to work with yanked name