rename and refactor rake tasks