MAP-961: fix naming convention