diff --git a/manifests/cluster/cassandra.pp b/manifests/cluster/cassandra.pp
index b20926bed..7650d274f 100644
--- a/manifests/cluster/cassandra.pp
+++ b/manifests/cluster/cassandra.pp
@@ -58,7 +58,7 @@ class tripleo::cluster::cassandra(
   # https://tickets.puppetlabs.com/browse/PUP-1299
   #
   # validate_array($cassandra_servers)
-  validate_ipv4_address($cassandra_ip)
+  validate_legacy(Stdlib::IP::Address::V4, 'validate_ipv4_address', $cassandra_ip)
 
   class {'::cassandra':
     cluster_name          => 'TripleO',
diff --git a/manifests/cluster/zookeeper.pp b/manifests/cluster/zookeeper.pp
index 82d21eefe..6e68071af 100644
--- a/manifests/cluster/zookeeper.pp
+++ b/manifests/cluster/zookeeper.pp
@@ -44,7 +44,7 @@ class tripleo::cluster::zookeeper(
   # https://tickets.puppetlabs.com/browse/PUP-1299
 
   # validate_array($zookeeper_server_ips)
-  validate_ipv4_address($zookeeper_client_ip)
+  validate_legacy(Stdlib::IP::Address::V4, 'validate_ipv4_address', $zookeeper_client_ip)
   # validate_array($zookeeper_hostnames)
 
   # TODO(devvesa) Zookeeper package should provide these paths,
diff --git a/manifests/firewall/rule.pp b/manifests/firewall/rule.pp
index f11227310..8a664cb7b 100644
--- a/manifests/firewall/rule.pp
+++ b/manifests/firewall/rule.pp
@@ -145,8 +145,8 @@ define tripleo::firewall::rule (
 
   $ipv4_rule = merge($basic, $state_rule, $extras)
   $ipv6_rule = merge($basic, $state_rule, $ipv6, $extras)
-  validate_hash($ipv4_rule)
-  validate_hash($ipv6_rule)
+  validate_legacy(Hash, 'validate_hash', $ipv4_rule)
+  validate_legacy(Hash, 'validate_hash', $ipv6_rule)
 
   # This conditional will ensure that TCP and UDP firewall rules have
   # a port specified in the configuration when using INPUT or OUTPUT chains.
diff --git a/manifests/host/liquidio/config.pp b/manifests/host/liquidio/config.pp
index 05d0feaba..876b6e3e4 100644
--- a/manifests/host/liquidio/config.pp
+++ b/manifests/host/liquidio/config.pp
@@ -28,7 +28,7 @@ class tripleo::host::liquidio::config (
   $liquidio_config = {}
 ) {
 
-    validate_hash($liquidio_config)
+  validate_legacy(Hash, 'validate_hash', $liquidio_config)
 
-    create_resources('liquidio_config', $liquidio_config)
+  create_resources('liquidio_config', $liquidio_config)
 }
diff --git a/manifests/network/contrail/config.pp b/manifests/network/contrail/config.pp
index 2cd161398..d2558a2e0 100644
--- a/manifests/network/contrail/config.pp
+++ b/manifests/network/contrail/config.pp
@@ -251,9 +251,10 @@ class tripleo::network::contrail::config(
   $zk_server_ip           = hiera('contrail_database_node_ips'),
 )
 {
-  validate_ip_address($listen_ip_address)
-  validate_ip_address($disc_server_ip)
-  validate_ip_address($ifmap_server_ip)
+
+  validate_legacy(Stdlib::IP::Address, 'validate_ip_address', $listen_ip_address)
+  validate_legacy(Stdlib::IP::Address, 'validate_ip_address', $disc_server_ip)
+  validate_legacy(Stdlib::IP::Address, 'validate_ip_address', $ifmap_server_ip)
   $basicauthusers_property_control = map($control_server_list) |$item| { "${item}.control:${item}.control" }
   $basicauthusers_property_dns = $control_server_list.map |$item| { "${item}.dns:${item}.dns" }
   $basicauthusers_property = concat($basicauthusers_property_control, $basicauthusers_property_dns)
diff --git a/manifests/network/contrail/neutron_plugin.pp b/manifests/network/contrail/neutron_plugin.pp
index 52cdc62ae..36800cea2 100644
--- a/manifests/network/contrail/neutron_plugin.pp
+++ b/manifests/network/contrail/neutron_plugin.pp
@@ -123,7 +123,7 @@ class tripleo::network::contrail::neutron_plugin (
   include ::neutron::deps
   include ::neutron::params
 
-  validate_array($contrail_extensions)
+  validate_legacy(Array, 'validate_array', $contrail_extensions)
 
   package { 'neutron-plugin-contrail':
     ensure => $package_ensure,
diff --git a/manifests/profile/base/aide/rules.pp b/manifests/profile/base/aide/rules.pp
index 7c1ea3fb8..514773906 100644
--- a/manifests/profile/base/aide/rules.pp
+++ b/manifests/profile/base/aide/rules.pp
@@ -51,7 +51,7 @@ define tripleo::profile::base::aide::rules (
   {
     fail('$order must be a string or an integer')
   }
-  validate_string($body)
+  validate_legacy(String, 'validate_string', $body)
 
   concat::fragment{ "aide_fragment_${name}":
     target  => 'aide.conf',
diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index 59dd3100b..a6732d141 100644
--- a/manifests/profile/base/database/mysql.pp
+++ b/manifests/profile/base/database/mysql.pp
@@ -116,8 +116,8 @@ class tripleo::profile::base::database::mysql (
     $sync_db = false
   }
 
-  validate_hash($mysql_server_options)
-  validate_hash($certificate_specs)
+  validate_legacy(Hash, 'validate_hash', $mysql_server_options)
+  validate_legacy(Hash, 'validate_hash', $certificate_specs)
 
   if $enable_internal_tls {
     $tls_certfile = $certificate_specs['service_certificate']
diff --git a/manifests/profile/base/database/mysql/user.pp b/manifests/profile/base/database/mysql/user.pp
index 5ebc156c1..225b92148 100644
--- a/manifests/profile/base/database/mysql/user.pp
+++ b/manifests/profile/base/database/mysql/user.pp
@@ -48,7 +48,7 @@ define tripleo::profile::base::database::mysql::user (
   $allowed_hosts = undef
 ) {
 
-  validate_string($password)
+  validate_legacy(String, 'validate_string', $password)
 
   ::openstacklib::db::mysql { $title :
     user          => $user,
diff --git a/manifests/profile/base/etcd.pp b/manifests/profile/base/etcd.pp
index 86240be88..36596a235 100644
--- a/manifests/profile/base/etcd.pp
+++ b/manifests/profile/base/etcd.pp
@@ -65,7 +65,7 @@ class tripleo::profile::base::etcd (
   $step                = Integer(hiera('step')),
 ) {
 
-  validate_hash($certificate_specs)
+  validate_legacy(Hash, 'validate_hash', $certificate_specs)
 
   if $enable_internal_tls {
     $tls_certfile = $certificate_specs['service_certificate']
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index cd86fc216..c146da485 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -261,7 +261,7 @@ class tripleo::profile::base::keystone (
     include ::keystone::security_compliance
 
     if $ldap_backend_enable {
-      validate_hash($ldap_backends_config)
+      validate_legacy(Hash, 'validate_hash', $ldap_backends_config)
       if !str2bool($::selinux) {
         selboolean { 'authlogin_nsswitch_use_ldap':
             value      => on,
diff --git a/manifests/profile/base/neutron/opendaylight.pp b/manifests/profile/base/neutron/opendaylight.pp
index 9912be9f9..b93103f21 100644
--- a/manifests/profile/base/neutron/opendaylight.pp
+++ b/manifests/profile/base/neutron/opendaylight.pp
@@ -49,7 +49,7 @@ class tripleo::profile::base::neutron::opendaylight (
   $enable_internal_tls = hiera('enable_internal_tls', false),
 ) {
 
-  validate_hash($certificate_specs)
+  validate_legacy(Hash, 'validate_hash', $certificate_specs)
 
   if $enable_internal_tls {
     $tls_certfile = $certificate_specs['service_certificate']
@@ -60,7 +60,7 @@ class tripleo::profile::base::neutron::opendaylight (
   }
 
   if $step >= 1 {
-    validate_array($odl_api_ips)
+    validate_legacy(Array, 'validate_array', $odl_api_ips)
     if empty($odl_api_ips) {
       fail('No IPs assigned to OpenDaylight Api Service')
     } elsif size($odl_api_ips) == 2 {
diff --git a/manifests/profile/base/nova/migration/target.pp b/manifests/profile/base/nova/migration/target.pp
index a2f125641..cd1fd1342 100644
--- a/manifests/profile/base/nova/migration/target.pp
+++ b/manifests/profile/base/nova/migration/target.pp
@@ -52,10 +52,14 @@ class tripleo::profile::base::nova::migration::target (
 
   include ::tripleo::profile::base::nova::migration
 
-  validate_array($ssh_localaddrs)
-  $ssh_localaddrs.each |$x| { validate_ip_address($x) }
+  validate_legacy(Array, 'validate_array', $ssh_localaddrs)
+
+  $ssh_localaddrs.each |$x| {
+    validate_legacy(Stdlib::IP::Address, 'validate_ip_address', $x)
+  }
+
   $ssh_localaddrs_real = unique($ssh_localaddrs)
-  validate_array($ssh_authorized_keys)
+  validate_legacy(Array, 'validate_array', $ssh_authorized_keys)
   $ssh_authorized_keys_real = join($ssh_authorized_keys, '\n')
 
   if $step >= 4 {
diff --git a/manifests/profile/base/securetty.pp b/manifests/profile/base/securetty.pp
index 5c36fe642..3d6351e72 100644
--- a/manifests/profile/base/securetty.pp
+++ b/manifests/profile/base/securetty.pp
@@ -32,7 +32,8 @@ class tripleo::profile::base::securetty (
   $step = Integer(hiera('step')),
   $tty_list = hiera('tty_list', []),
 ) {
-  validate_array($tty_list)
+
+  validate_legacy(Array, 'validate_array', $tty_list)
 
   if $step >=1 {
     $ttys = join($tty_list, "\n")
diff --git a/manifests/profile/base/snmp.pp b/manifests/profile/base/snmp.pp
index 6c26e1c48..a47009dc2 100644
--- a/manifests/profile/base/snmp.pp
+++ b/manifests/profile/base/snmp.pp
@@ -57,7 +57,7 @@ class tripleo::profile::base::snmp (
       authpass => $snmpd_password,
     }
     if $snmpd_config {
-      validate_array($snmpd_config)
+      validate_legacy(Array, 'validate_array', $snmpd_config)
       class { '::snmp':
         snmpd_config => $snmpd_config,
       }
diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp
index fa37a91dd..5e7b226f0 100644
--- a/manifests/profile/base/swift/ringbuilder.pp
+++ b/manifests/profile/base/swift/ringbuilder.pp
@@ -110,7 +110,7 @@ class tripleo::profile::base::swift::ringbuilder (
   }
 
   if $step >= 3 {
-    validate_bool($build_ring)
+    validate_legacy(Boolean, 'validate_bool', $build_ring)
 
     if $build_ring {
       if $devices {