More fixes/renames