Adopt new naming scheme