Thanks for the patches! I'd _really_ prefer for all s/files/rsrc/ renaming being in a single prep patch instead of spilling it all around. I found one bug, but to be honest it's hard to get through when functional changes and other cleanups are buried under tons of such renaming.
I've tried to gather as much of the renames that can be grouped together in the next version I'm about to send. It is hard however to put all renames in one place since they often go hand in hand with a corresponding functionality change. I appreciate though that the renames get in the way, sorry for that :-) If you think more can be done after the next version, I'll look into more.
