Fixing naming to latest version provided by MS