Replaced names with bad practices
fixed conflict