Fixed some bugs introduced by the automated renaming.

4 files changed