APOLLO-2413 Fixed case mapping