Naming :p

I did this on github, so I hope it didn't break anything... huehue