Sorry, forgot to include the renaming and a minor bugfix.

Sean