few naming improvements