Protection against case sensivity

.upcase to strings
Shorter names...