Fix some issues in renaming iam api, also fix marvin library.