Changed some names, updated type formatting