Change for CamelCase IDs in mantle