more renaming (IDIOT!)
merged name changes