Replacing names also on messages. Simplifying code as well.
Using fastforEach in some places