changed return value names to fit code. (was originally changed to conform with python code styles.