QA - name convention

it was messy for me, i propose more clear and most important unify name
convention