Some renames and minor fixes.