Made some name changes