Complete fix for #106

Complete the renaming for #106