Made additional naming changes to schematic.