Resolve mapping capitalisation to fix tests