a few naming improvements