Switch from StudlyCase to camelCase in more places