We seem to be mixing styles here, snake case and camel case. We should pick a convention and stick to it, maybe follow what Narwhal use?