Fix/review tags naming

lopesgrequested to merge
fix/review-tags-naming into develop

Merge request reports