changed names to better fit role