refactor daiquiri.naming