#158 Sprint 2 Fixing labels names