Some comments, changes for mantle CamelCase IDs