refactor bad name