Fixed some issues after the rename.