Rename variables
Remove requiring bundle/gem_tasks from Rakefile