Minor formatting and renaming changes, also made stale entity test do fewer updates (it still fails).