Did some renaming and finalization.