heroku debugging and a little renaming