Fix double mapping in Acquirer and Shooter