Fix noSwimingInArmor to no SwimmingInArmor

There might be additional refactoring required. I honestly do not have time to check the whole code but I strongly suggest you do otherwise confusion might arise.