Changed chart naming for more consistency
new chart types