Types fix - use convention