diff --git a/tasks/main.yml b/tasks/main.yml
index 7b21de1..8461e37 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,24 +1,27 @@
----
 - name: Detect network provider
   set_fact:
       network_provider: "{{ network.provider | default(network_provider_default[ansible_distribution][ansible_distribution_major_version] | default('nm')) }}"
   when: network_provider is not defined
 
-
 - name: Enable network service
-  service: name=network enabled=yes
+  service:
+    name: network
+    enabled: yes
   when: network_provider == 'initscripts'
 
-
 - name: Install NetworkManager package
-  package: name=NetworkManager state=present
+  package:
+    name: NetworkManager
+    state: present
   when: network_provider == 'nm'
 
 - name: Enable NetworkManager service
-  service: name=NetworkManager state=running enabled=yes
+  service:
+    name: NetworkManager
+    state: running
+    enabled: yes
   when: network_provider == 'nm'
 
-
 - name: Configure networking connection profiles
   network_connections:
       provider:       "{{ network_provider    | mandatory }}"