Fix some syntax/naming issues.

Yeah, I think on balance we could - let's kick that out to a separate PR and make sure we notify alaveteli-dev first.