Type fixed. API names changed