Fixing all is not that easy, coz it requires testing again each and every locator before using them.
We are already using random-generator, so probably nothing should break, but would like to avoid using contains for dynamic locators as much as I can. :)

Also, my intention is to recommend "Best Practise" as and when I am aware of things, so that every one take it into consideration and implement it eventually.