Scoring logics

Also some renaming.