refactor data name