update to consistent naming scheme and functionality