APOLLO-3964 Fixed mappings