renamed types to kinds