massive names replacement
update using underscore notation