remove legacy from naming conventions