Fixed old names.