Tweaking names to match terminology