Update to new name and resolve minor warnings