Changed to CamelCase for conventions. Not a fan of CamelCase, but my girlfriend thinks underscores are evil.