name policy and minor changes