naming improvements