modified names to make better sence