Made instanceNameFormat follow the new namespace convention.