fix: some naming bugs.