Updated types file
Final fixups for naming