refactor(): make sure deprecated msg variables dont clash