updated names so stuff doesn't break