Fixed name conflicts in method swizzling