Fix Naming for Windows Services