Add rake task and naming consitency