Agreed, after looking this over some more, I think that everything here is fine as is. We already use the split naming convention so these changes agree with what we already use.