Fixed some wrong renames