Fix some terminology and try to fix citation authors