again fix the uuid namings!