Fix capitalizaion problems