more updates to support the new name computation specification.