Update names to match issue description.