Refactor dot name processing