Minor renames... everything now works with code from this repo