diff --git a/salt/cloud/clouds/botocore_aws.py b/salt/cloud/clouds/botocore_aws.py
index 9f25c302d3..c351031ac1 100644
--- a/salt/cloud/clouds/botocore_aws.py
+++ b/salt/cloud/clouds/botocore_aws.py
@@ -52,7 +52,7 @@ import logging
 # Import salt.cloud libs
 import salt.cloud.config as config
 from salt.cloud.utils import namespaced_function
-from salt.cloud.libcloudfuncs import *        # pylint: disable-msg=W0614,W0401
+from salt.cloud.libcloudfuncs import *        # pylint: disable=W0614,W0401
 from salt.cloud.exceptions import SaltCloudException, SaltCloudSystemExit
 
 # Import libcloudfuncs and libcloud_aws, required to latter patch __opts__
@@ -61,7 +61,7 @@ from salt.cloud.clouds import libcloud_aws
 # Import libcloud_aws, storing pre and post locals so we can namespace any
 # callable to this module.
 PRE_IMPORT_LOCALS_KEYS = locals().copy()
-from salt.cloud.clouds.libcloud_aws import *  # pylint: disable-msg=W0614,W0401
+from salt.cloud.clouds.libcloud_aws import *  # pylint: disable=W0614,W0401
 POST_IMPORT_LOCALS_KEYS = locals().copy()
 
 # Get logging started
diff --git a/salt/cloud/clouds/cloudstack.py b/salt/cloud/clouds/cloudstack.py
index cb45b2bc42..dec323ba90 100644
--- a/salt/cloud/clouds/cloudstack.py
+++ b/salt/cloud/clouds/cloudstack.py
@@ -28,7 +28,7 @@ import logging
 
 # Import salt cloud libs
 import salt.cloud.config as config
-from salt.cloud.libcloudfuncs import *   # pylint: disable-msg=W0614,W0401
+from salt.cloud.libcloudfuncs import *   # pylint: disable=W0614,W0401
 from salt.cloud.utils import namespaced_function
 from salt.cloud.exceptions import SaltCloudSystemExit
 
diff --git a/salt/cloud/clouds/ec2.py b/salt/cloud/clouds/ec2.py
index e6066fe73e..a0bae5f079 100644
--- a/salt/cloud/clouds/ec2.py
+++ b/salt/cloud/clouds/ec2.py
@@ -88,7 +88,7 @@ from salt._compat import ElementTree as ET
 # Import salt.cloud libs
 import salt.cloud.utils
 import salt.cloud.config as config
-from salt.cloud.libcloudfuncs import *   # pylint: disable-msg=W0614,W0401
+from salt.cloud.libcloudfuncs import *   # pylint: disable=W0614,W0401
 from salt.cloud.exceptions import (
     SaltCloudException,
     SaltCloudSystemExit,
diff --git a/salt/cloud/clouds/gogrid.py b/salt/cloud/clouds/gogrid.py
index 7b806633dd..8a6a883443 100644
--- a/salt/cloud/clouds/gogrid.py
+++ b/salt/cloud/clouds/gogrid.py
@@ -43,7 +43,7 @@ import pprint
 import logging
 
 # Import generic libcloud functions
-from salt.cloud.libcloudfuncs import *   # pylint: disable-msg=W0614,W0401
+from salt.cloud.libcloudfuncs import *   # pylint: disable=W0614,W0401
 
 # Import salt cloud libs
 import salt.cloud.config as config
diff --git a/salt/cloud/clouds/ibmsce.py b/salt/cloud/clouds/ibmsce.py
index 150f4fc4b1..bbd63864e3 100644
--- a/salt/cloud/clouds/ibmsce.py
+++ b/salt/cloud/clouds/ibmsce.py
@@ -54,7 +54,7 @@ import logging
 from libcloud.compute.base import NodeAuthSSHKey
 
 # Import generic libcloud functions
-from salt.cloud.libcloudfuncs import *   # pylint: disable-msg=W0614,W0401
+from salt.cloud.libcloudfuncs import *   # pylint: disable=W0614,W0401
 
 # Import salt.cloud libs
 import salt.cloud.config as config
diff --git a/salt/cloud/clouds/joyent.py b/salt/cloud/clouds/joyent.py
index 39bf3932f3..8a1aa39684 100644
--- a/salt/cloud/clouds/joyent.py
+++ b/salt/cloud/clouds/joyent.py
@@ -61,7 +61,7 @@ import inspect
 import yaml
 
 # Import generic libcloud functions
-from salt.cloud.libcloudfuncs import *   # pylint: disable-msg=W0614,W0401
+from salt.cloud.libcloudfuncs import *   # pylint: disable=W0614,W0401
 
 # Import salt.cloud libs
 import salt.cloud.utils
diff --git a/salt/cloud/clouds/libcloud_aws.py b/salt/cloud/clouds/libcloud_aws.py
index 813c287151..2af57fe8ec 100644
--- a/salt/cloud/clouds/libcloud_aws.py
+++ b/salt/cloud/clouds/libcloud_aws.py
@@ -56,7 +56,7 @@ import logging
 import salt.cloud.utils
 import salt.cloud.config as config
 from salt.cloud.utils import namespaced_function
-from salt.cloud.libcloudfuncs import *   # pylint: disable-msg=W0614,W0401
+from salt.cloud.libcloudfuncs import *   # pylint: disable=W0614,W0401
 from salt.cloud.libcloudfuncs import destroy as libcloudfuncs_destroy
 from salt.cloud.exceptions import (
     SaltCloudException,
diff --git a/salt/cloud/clouds/linode.py b/salt/cloud/clouds/linode.py
index edc4dd8af3..2d10ff5b1a 100644
--- a/salt/cloud/clouds/linode.py
+++ b/salt/cloud/clouds/linode.py
@@ -38,7 +38,7 @@ from libcloud.compute.base import NodeAuthPassword
 
 # Import salt cloud libs
 import salt.cloud.config as config
-from salt.cloud.libcloudfuncs import *   # pylint: disable-msg=W0614,W0401
+from salt.cloud.libcloudfuncs import *   # pylint: disable=W0614,W0401
 from salt.cloud.utils import namespaced_function
 
 
diff --git a/salt/cloud/clouds/nova.py b/salt/cloud/clouds/nova.py
index 331dbb3ffe..bbdf1c71e8 100644
--- a/salt/cloud/clouds/nova.py
+++ b/salt/cloud/clouds/nova.py
@@ -90,7 +90,7 @@ except Exception:
     pass
 
 # Import generic libcloud functions
-from salt.cloud.libcloudfuncs import *   # pylint: disable-msg=W0614,W0401
+from salt.cloud.libcloudfuncs import *   # pylint: disable=W0614,W0401
 
 # Import nova libs
 HASNOVA = False
diff --git a/salt/cloud/clouds/openstack.py b/salt/cloud/clouds/openstack.py
index eb5dd84a55..8eedd93423 100644
--- a/salt/cloud/clouds/openstack.py
+++ b/salt/cloud/clouds/openstack.py
@@ -140,7 +140,7 @@ except Exception:
     pass
 
 # Import generic libcloud functions
-from salt.cloud.libcloudfuncs import *   # pylint: disable-msg=W0614,W0401
+from salt.cloud.libcloudfuncs import *   # pylint: disable=W0614,W0401
 
 # Import salt libs
 import salt.utils
diff --git a/salt/cloud/clouds/rackspace.py b/salt/cloud/clouds/rackspace.py
index 03a2f57d01..5e830fa506 100644
--- a/salt/cloud/clouds/rackspace.py
+++ b/salt/cloud/clouds/rackspace.py
@@ -49,7 +49,7 @@ import pprint
 from libcloud.compute.base import NodeState
 
 # Import generic libcloud functions
-from salt.cloud.libcloudfuncs import *   # pylint: disable-msg=W0614,W0401
+from salt.cloud.libcloudfuncs import *   # pylint: disable=W0614,W0401
 
 # Import salt libs
 import salt.utils
diff --git a/salt/cloud/clouds/softlayer-hw.py b/salt/cloud/clouds/softlayer-hw.py
index c4defd4cb0..014d9f8546 100644
--- a/salt/cloud/clouds/softlayer-hw.py
+++ b/salt/cloud/clouds/softlayer-hw.py
@@ -31,7 +31,7 @@ import time
 # Import salt cloud libs
 import salt.cloud.config as config
 from salt.cloud.exceptions import SaltCloudSystemExit
-from salt.cloud.libcloudfuncs import *   # pylint: disable-msg=W0614,W0401
+from salt.cloud.libcloudfuncs import *   # pylint: disable=W0614,W0401
 from salt.cloud.utils import namespaced_function
 
 # Attempt to import softlayer lib
diff --git a/salt/cloud/clouds/softlayer.py b/salt/cloud/clouds/softlayer.py
index 86345469ae..1d81c58aa2 100644
--- a/salt/cloud/clouds/softlayer.py
+++ b/salt/cloud/clouds/softlayer.py
@@ -31,7 +31,7 @@ import time
 # Import salt cloud libs
 import salt.cloud.config as config
 from salt.cloud.exceptions import SaltCloudSystemExit
-from salt.cloud.libcloudfuncs import *   # pylint: disable-msg=W0614,W0401
+from salt.cloud.libcloudfuncs import *   # pylint: disable=W0614,W0401
 from salt.cloud.utils import namespaced_function
 
 # Attempt to import softlayer lib
diff --git a/salt/cloud/libcloudfuncs.py b/salt/cloud/libcloudfuncs.py
index d7ffe0db09..ce902d6645 100644
--- a/salt/cloud/libcloudfuncs.py
+++ b/salt/cloud/libcloudfuncs.py
@@ -9,7 +9,7 @@ import os
 import logging
 
 
-# pylint: disable-msg=W0611
+# pylint: disable=W0611
 # Import libcloud
 from libcloud.compute.types import Provider
 from libcloud.compute.providers import get_driver
@@ -97,7 +97,7 @@ def avail_locations(conn=None):
     relevant data
     '''
     if not conn:
-        conn = get_conn()   # pylint: disable-msg=E0602
+        conn = get_conn()   # pylint: disable=E0602
 
     locations = conn.list_locations()
     ret = {}
@@ -128,7 +128,7 @@ def avail_images(conn=None):
     relevant data
     '''
     if not conn:
-        conn = get_conn()   # pylint: disable-msg=E0602
+        conn = get_conn()   # pylint: disable=E0602
 
     images = conn.list_images()
     ret = {}
@@ -157,7 +157,7 @@ def avail_sizes(conn=None):
     relevant data
     '''
     if not conn:
-        conn = get_conn()   # pylint: disable-msg=E0602
+        conn = get_conn()   # pylint: disable=E0602
 
     sizes = conn.list_sizes()
     ret = {}
@@ -289,7 +289,7 @@ def destroy(name, conn=None):
     )
 
     if not conn:
-        conn = get_conn()   # pylint: disable-msg=E0602
+        conn = get_conn()   # pylint: disable=E0602
 
     node = get_node(conn, name)
     if node is None:
@@ -319,7 +319,7 @@ def reboot(name, conn=None):
     Reboot a single VM
     '''
     if not conn:
-        conn = get_conn()   # pylint: disable-msg=E0602
+        conn = get_conn()   # pylint: disable=E0602
 
     node = get_node(conn, name)
     if node is None:
@@ -351,7 +351,7 @@ def list_nodes(conn=None):
     Return a list of the VMs that are on the provider
     '''
     if not conn:
-        conn = get_conn()   # pylint: disable-msg=E0602
+        conn = get_conn()   # pylint: disable=E0602
 
     nodes = conn.list_nodes()
     ret = {}
@@ -373,7 +373,7 @@ def list_nodes_full(conn=None):
     Return a list of the VMs that are on the provider, with all fields
     '''
     if not conn:
-        conn = get_conn()   # pylint: disable-msg=E0602
+        conn = get_conn()   # pylint: disable=E0602
 
     nodes = conn.list_nodes()
     ret = {}
@@ -390,7 +390,7 @@ def list_nodes_select(conn=None):
     Return a list of the VMs that are on the provider, with select fields
     '''
     if not conn:
-        conn = get_conn()   # pylint: disable-msg=E0602
+        conn = get_conn()   # pylint: disable=E0602
 
     nodes = conn.list_nodes()
     ret = {}