Renaming types to match new functions