Update to new naming scheme