changed names to fit a more general look on what we are doing