Fix remaining old names.
Fix some typos. Fix Girl/likes relation.