Some changes to the Nameable and Identifiable interfaces