Ignore -Wshadow for NoLifeNx
Adjust type names to match new NoLifeNx type names