Any chance this could all be CamelCase'd?