I renamed a lot of these this morning before I realized you'd already been in here. I agree, the readability left a lot to be desired.