Updated documentation, renamed types