Fix wrong names in messages