I'll change the names :)
...or is there something else I should be doing here?