Moving variables to more hiera compatible format.