change a few names
merged