fix to multiple naming function