Changed uppercase handling