Added Windows policy and name changes