EAGLESIX-2687 fixed some leftover naming issues