gc: Some small cleanups and file renaming