refactoring  due to conflicting Python names