Rename task and clean bug solved