Switched to new standard names for stores and other objects.