Make labels case sensitive
Make more use of const