Fix method names

I think you stopped halfway through a code refactor leaving the code quite broken. This should hopefully be a step in the right directions. The examples from the blog run again although I haven't been able to verify if it's actually working yet.