Fix all the identifiers to work with puppet 3.4