Minor interface changes and unique name transformation