a bit more cleaning up and correcting data names for yaml files