Further name changes
Large name refactoring
Replace != None with is not None
Replace == None with is None