updating type names
cleaning up