General fixes, renames.