Changed "-nest" to "-or" to remove deprecation warnings

Main code rev. 1832