Making swizzled method names more unique, to avoid clashes

This is just some cleanup.