cleaning up type names, adding private-email