Fixed some bugs introduced by the automated renaming.