patching up a few name discrepencies