changed names to more useful naming convention